upgrade to EMF 2.8drops/I20110925-0426

author: Eike Stepper 2011-09-25 08:23:58 +0000
committer: Eike Stepper 2011-09-25 08:23:58 +0000
commit: 53f0bebdc539db62a911cc27dff34cd49e135ee2 (patch)
tree: a34440a27b6385077fa072e2ecd68c392e83818b
parent: e324acc45cf0942c7972a6a496b75c45418b982d (diff)
download: cdo-53f0bebdc539db62a911cc27dff34cd49e135ee2.tar.gz
cdo-53f0bebdc539db62a911cc27dff34cd49e135ee2.tar.xz
cdo-53f0bebdc539db62a911cc27dff34cd49e135ee2.zip
161 files changed, 2709 insertions, 3601 deletions
diff --git a/plugins/org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.genmodel b/plugins/org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.genmodel
index 222c7d1d9a..395edbf5c3 100644
--- a/plugins/org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.genmodel
+++ b/plugins/org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.genmodel
@@ -1,56 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&#xA; * All rights reserved. This program and the accompanying materials&#xA; * are made available under the terms of the Eclipse Public License v1.0&#xA; * which accompanies this distribution, and is available at&#xA; * http://www.eclipse.org/legal/epl-v10.html&#xA; * &#xA; * Contributors:&#xA; *    Andre Dietisheim - initial API and implementation"
-    modelDirectory="/org.eclipse.emf.cdo.defs/src" editDirectory="" editorDirectory=""
-    modelPluginID="org.eclipse.emf.cdo.defs" modelName="Org.eclipse.emf.cdo" codeFormatting="true"
-    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
-    copyrightFields="false" usedGenPackages="../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel#//defs ../../org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.genmodel#//defs">
-  <foreignModel>org.eclipse.emf.cdo.defs.ecore</foreignModel>
-  <genPackages prefix="CDODefs" basePackage="org.eclipse.emf.cdo" disposableProviderFactory="true"
-      ecorePackage="org.eclipse.emf.cdo.defs.ecore#/">
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="org.eclipse.emf.cdo.defs.ecore#//ResourceMode">
-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.emf.cdo.defs.ecore#//ResourceMode/GET"/>
-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.emf.cdo.defs.ecore#//ResourceMode/CREATE"/>
-      <genEnumLiterals ecoreEnumLiteral="org.eclipse.emf.cdo.defs.ecore#//ResourceMode/GET_OR_CREATE"/>
-    </genEnums>
-    <genClasses ecoreClass="org.eclipse.emf.cdo.defs.ecore#//CDOViewDef">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.emf.cdo.defs.ecore#//CDOViewDef/cdoSessionDef"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.emf.cdo.defs.ecore#//CDOTransactionDef"/>
-    <genClasses ecoreClass="org.eclipse.emf.cdo.defs.ecore#//CDOAuditDef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.emf.cdo.defs.ecore#//CDOAuditDef/timeStamp"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.emf.cdo.defs.ecore#//CDOSessionDef">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.emf.cdo.defs.ecore#//CDOSessionDef/connectorDef"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.emf.cdo.defs.ecore#//CDOSessionDef/repositoryName"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.emf.cdo.defs.ecore#//CDOSessionDef/cdoPackageRegistryDef"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.emf.cdo.defs.ecore#//CDOSessionDef/legacySupportEnabled"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.emf.cdo.defs.ecore#//CDOSessionDef/failOverStrategyDef"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="org.eclipse.emf.cdo.defs.ecore#//FailOverStrategyDef">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.emf.cdo.defs.ecore#//FailOverStrategyDef/connectorDef"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.emf.cdo.defs.ecore#//RetryFailOverStrategyDef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.emf.cdo.defs.ecore#//RetryFailOverStrategyDef/retries"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.emf.cdo.defs.ecore#//CDOPackageRegistryDef">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.emf.cdo.defs.ecore#//CDOPackageRegistryDef/packages"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.emf.cdo.defs.ecore#//CDOEagerPackageRegistryDef"/>
-    <genClasses ecoreClass="org.eclipse.emf.cdo.defs.ecore#//CDOLazyPackageRegistryDef"/>
-    <genClasses image="false" ecoreClass="org.eclipse.emf.cdo.defs.ecore#//EPackageDef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.emf.cdo.defs.ecore#//EPackageDef/nsURI"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.emf.cdo.defs.ecore#//EDynamicPackageDef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.emf.cdo.defs.ecore#//EDynamicPackageDef/resourceURI"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.emf.cdo.defs.ecore#//EGlobalPackageDef"/>
-    <genClasses ecoreClass="org.eclipse.emf.cdo.defs.ecore#//CDOClientProtocolFactoryDef"/>
-    <genClasses ecoreClass="org.eclipse.emf.cdo.defs.ecore#//CDOResourceDef">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.emf.cdo.defs.ecore#//CDOResourceDef/cdoTransaction"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.emf.cdo.defs.ecore#//CDOResourceDef/resourceMode"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.emf.cdo.defs.ecore#//CDOResourceDef/path"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&#xA; * All rights reserved. This program and the accompanying materials&#xA; * are made available under the terms of the Eclipse Public License v1.0&#xA; * which accompanies this distribution, and is available at&#xA; * http://www.eclipse.org/legal/epl-v10.html&#xA; * &#xA; * Contributors:&#xA; *    Andre Dietisheim - initial API and implementation"
+    modelDirectory="/org.eclipse.emf.cdo.defs/src" editDirectory="" editorDirectory=""
+    modelPluginID="org.eclipse.emf.cdo.defs" modelName="Org.eclipse.emf.cdo" codeFormatting="true"
+    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
+    copyrightFields="false" runtimeVersion="2.6" usedGenPackages="../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel#//defs ../../org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.genmodel#//defs">
+  <foreignModel>org.eclipse.emf.cdo.defs.ecore</foreignModel>
+  <genPackages prefix="CDODefs" basePackage="org.eclipse.emf.cdo" disposableProviderFactory="true"
+      ecorePackage="org.eclipse.emf.cdo.defs.ecore#/">
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="org.eclipse.emf.cdo.defs.ecore#//ResourceMode">
+      <genEnumLiterals ecoreEnumLiteral="org.eclipse.emf.cdo.defs.ecore#//ResourceMode/GET"/>
+      <genEnumLiterals ecoreEnumLiteral="org.eclipse.emf.cdo.defs.ecore#//ResourceMode/CREATE"/>
+      <genEnumLiterals ecoreEnumLiteral="org.eclipse.emf.cdo.defs.ecore#//ResourceMode/GET_OR_CREATE"/>
+    </genEnums>
+    <genClasses ecoreClass="org.eclipse.emf.cdo.defs.ecore#//CDOViewDef">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.emf.cdo.defs.ecore#//CDOViewDef/cdoSessionDef"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.emf.cdo.defs.ecore#//CDOTransactionDef"/>
+    <genClasses ecoreClass="org.eclipse.emf.cdo.defs.ecore#//CDOAuditDef">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.emf.cdo.defs.ecore#//CDOAuditDef/timeStamp"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.emf.cdo.defs.ecore#//CDOSessionDef">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.emf.cdo.defs.ecore#//CDOSessionDef/connectorDef"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.emf.cdo.defs.ecore#//CDOSessionDef/repositoryName"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.emf.cdo.defs.ecore#//CDOSessionDef/cdoPackageRegistryDef"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.emf.cdo.defs.ecore#//CDOSessionDef/legacySupportEnabled"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.emf.cdo.defs.ecore#//CDOPackageRegistryDef">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.emf.cdo.defs.ecore#//CDOPackageRegistryDef/packages"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.emf.cdo.defs.ecore#//CDOEagerPackageRegistryDef"/>
+    <genClasses ecoreClass="org.eclipse.emf.cdo.defs.ecore#//CDOLazyPackageRegistryDef"/>
+    <genClasses image="false" ecoreClass="org.eclipse.emf.cdo.defs.ecore#//EPackageDef">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.emf.cdo.defs.ecore#//EPackageDef/nsURI"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.emf.cdo.defs.ecore#//EDynamicPackageDef">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.emf.cdo.defs.ecore#//EDynamicPackageDef/resourceURI"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.emf.cdo.defs.ecore#//EGlobalPackageDef"/>
+    <genClasses ecoreClass="org.eclipse.emf.cdo.defs.ecore#//CDOClientProtocolFactoryDef"/>
+    <genClasses ecoreClass="org.eclipse.emf.cdo.defs.ecore#//CDOResourceDef">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.emf.cdo.defs.ecore#//CDOResourceDef/cdoTransaction"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.emf.cdo.defs.ecore#//CDOResourceDef/resourceMode"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.emf.cdo.defs.ecore#//CDOResourceDef/path"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOAuditDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOAuditDef.java
index 358aabce3e..4d795a6ffe 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOAuditDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOAuditDef.java
@@ -15,13 +15,14 @@ import java.util.Date;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Audit Def</b></em>'. <!-- end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.defs.CDOAuditDef#getTimeStamp <em>Time Stamp</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.defs.CDOAuditDef#getTimeStamp <em>Time Stamp</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOAuditDef()
  * @model
  * @generated
@@ -29,13 +30,13 @@ import java.util.Date;
 public interface CDOAuditDef extends CDOViewDef
 {
   /**
-   * Returns the value of the '<em><b>Time Stamp</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Time Stamp</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Time Stamp</em>' attribute isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Time Stamp</em>' attribute.
    * @see #setTimeStamp(Date)
    * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOAuditDef_TimeStamp()
@@ -47,9 +48,7 @@ public interface CDOAuditDef extends CDOViewDef
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOAuditDef#getTimeStamp <em>Time Stamp</em>}' attribute.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Time Stamp</em>' attribute.
+   * @param value the new value of the '<em>Time Stamp</em>' attribute.
    * @see #getTimeStamp()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolFactoryDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolFactoryDef.java
index 6424d8921c..f44fe0d569 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolFactoryDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOClientProtocolFactoryDef.java
@@ -16,7 +16,8 @@ import org.eclipse.net4j.defs.ClientProtocolFactoryDef;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Client Protocol Factory Def</b></em>'. <!--
  * end-user-doc -->
- * 
+ *
+ *
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOClientProtocolFactoryDef()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsFactory.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsFactory.java
index 7cd776394a..11bdc94ebc 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsFactory.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsFactory.java
@@ -16,54 +16,53 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
  * the model. <!-- end-user-doc -->
- * 
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage
  * @generated
  */
 public interface CDODefsFactory extends EFactory
 {
   /**
-   * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The singleton instance of the factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   CDODefsFactory eINSTANCE = org.eclipse.emf.cdo.defs.impl.CDODefsFactoryImpl.init();
 
   /**
-   * Returns a new object of class '<em>CDO View Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>CDO View Def</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>CDO View Def</em>'.
    * @generated
    */
   CDOViewDef createCDOViewDef();
 
   /**
-   * Returns a new object of class '<em>CDO Transaction Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>CDO Transaction Def</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>CDO Transaction Def</em>'.
    * @generated
    */
   CDOTransactionDef createCDOTransactionDef();
 
   /**
-   * Returns a new object of class '<em>CDO Audit Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>CDO Audit Def</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>CDO Audit Def</em>'.
    * @generated
    */
   CDOAuditDef createCDOAuditDef();
 
   /**
-   * Returns a new object of class '<em>CDO Session Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>CDO Session Def</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>CDO Session Def</em>'.
    * @generated
    */
   CDOSessionDef createCDOSessionDef();
 
   /**
-   * Returns a new object of class '<em>CDO Package Registry Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>CDO Package Registry Def</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>CDO Package Registry Def</em>'.
    * @generated
    */
@@ -88,16 +87,16 @@ public interface CDODefsFactory extends EFactory
   CDOLazyPackageRegistryDef createCDOLazyPackageRegistryDef();
 
   /**
-   * Returns a new object of class '<em>EDynamic Package Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>EDynamic Package Def</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>EDynamic Package Def</em>'.
    * @generated
    */
   EDynamicPackageDef createEDynamicPackageDef();
 
   /**
-   * Returns a new object of class '<em>EGlobal Package Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>EGlobal Package Def</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>EGlobal Package Def</em>'.
    * @generated
    */
@@ -113,16 +112,16 @@ public interface CDODefsFactory extends EFactory
   CDOClientProtocolFactoryDef createCDOClientProtocolFactoryDef();
 
   /**
-   * Returns a new object of class '<em>CDO Resource Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>CDO Resource Def</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>CDO Resource Def</em>'.
    * @generated
    */
   CDOResourceDef createCDOResourceDef();
 
   /**
-   * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the package supported by this factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the package supported by this factory.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsPackage.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsPackage.java
index 806149a46d..c29c8e4172 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsPackage.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDODefsPackage.java
@@ -29,7 +29,6 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * 
  * @see org.eclipse.emf.cdo.defs.CDODefsFactory
  * @model kind="package"
  * @generated
@@ -37,29 +36,29 @@ import org.eclipse.emf.ecore.EReference;
 public interface CDODefsPackage extends EPackage
 {
   /**
-   * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The package name.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   String eNAME = "defs";
 
   /**
-   * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The package namespace URI.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   String eNS_URI = "http://www.eclipse.org/emf/CDO/defs/1.0.0";
 
   /**
-   * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The package namespace name.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   String eNS_PREFIX = "cdo.defs";
 
   /**
-   * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The singleton instance of the package.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   CDODefsPackage eINSTANCE = org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl.init();
@@ -75,8 +74,8 @@ public interface CDODefsPackage extends EPackage
   int CDO_VIEW_DEF = 0;
 
   /**
-   * The feature id for the '<em><b>Cdo Session Def</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Cdo Session Def</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -92,9 +91,8 @@ public interface CDODefsPackage extends EPackage
   int CDO_VIEW_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl
-   * <em>CDO Transaction Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl <em>CDO Transaction Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOTransactionDef()
    * @generated
@@ -102,17 +100,17 @@ public interface CDODefsPackage extends EPackage
   int CDO_TRANSACTION_DEF = 1;
 
   /**
-   * The feature id for the '<em><b>Cdo Session Def</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Cdo Session Def</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int CDO_TRANSACTION_DEF__CDO_SESSION_DEF = CDO_VIEW_DEF__CDO_SESSION_DEF;
 
   /**
-   * The number of structural features of the '<em>CDO Transaction Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>CDO Transaction Def</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
@@ -121,7 +119,6 @@ public interface CDODefsPackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl <em>CDO Audit Def</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @see org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOAuditDef()
    * @generated
@@ -129,16 +126,16 @@ public interface CDODefsPackage extends EPackage
   int CDO_AUDIT_DEF = 2;
 
   /**
-   * The feature id for the '<em><b>Cdo Session Def</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Cdo Session Def</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int CDO_AUDIT_DEF__CDO_SESSION_DEF = CDO_VIEW_DEF__CDO_SESSION_DEF;
 
   /**
-   * The feature id for the '<em><b>Time Stamp</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Time Stamp</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -154,9 +151,8 @@ public interface CDODefsPackage extends EPackage
   int CDO_AUDIT_DEF_FEATURE_COUNT = CDO_VIEW_DEF_FEATURE_COUNT + 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl <em>CDO Session Def</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl <em>CDO Session Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOSessionDef()
    * @generated
@@ -164,52 +160,51 @@ public interface CDODefsPackage extends EPackage
   int CDO_SESSION_DEF = 3;
 
   /**
-   * The feature id for the '<em><b>Connector Def</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Connector Def</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int CDO_SESSION_DEF__CONNECTOR_DEF = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
 
   /**
-   * The feature id for the '<em><b>Repository Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Repository Name</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int CDO_SESSION_DEF__REPOSITORY_NAME = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
 
   /**
-   * The feature id for the '<em><b>Cdo Package Registry Def</b></em>' reference. <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Cdo Package Registry Def</b></em>' reference.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 2;
 
   /**
-   * The feature id for the '<em><b>Legacy Support Enabled</b></em>' attribute. <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Legacy Support Enabled</b></em>' attribute.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 3;
 
   /**
-   * The number of structural features of the '<em>CDO Session Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>CDO Session Def</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int CDO_SESSION_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 4;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl
-   * <em>CDO Package Registry Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl <em>CDO Package Registry Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOPackageRegistryDef()
    * @generated
@@ -217,27 +212,26 @@ public interface CDODefsPackage extends EPackage
   int CDO_PACKAGE_REGISTRY_DEF = 4;
 
   /**
-   * The feature id for the '<em><b>Packages</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Packages</b></em>' containment reference list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int CDO_PACKAGE_REGISTRY_DEF__PACKAGES = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
 
   /**
-   * The number of structural features of the '<em>CDO Package Registry Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>CDO Package Registry Def</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int CDO_PACKAGE_REGISTRY_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOEagerPackageRegistryDefImpl
-   * <em>CDO Eager Package Registry Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOEagerPackageRegistryDefImpl <em>CDO Eager Package Registry Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.defs.impl.CDOEagerPackageRegistryDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOEagerPackageRegistryDef()
    * @generated
@@ -245,27 +239,26 @@ public interface CDODefsPackage extends EPackage
   int CDO_EAGER_PACKAGE_REGISTRY_DEF = 5;
 
   /**
-   * The feature id for the '<em><b>Packages</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Packages</b></em>' containment reference list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int CDO_EAGER_PACKAGE_REGISTRY_DEF__PACKAGES = CDO_PACKAGE_REGISTRY_DEF__PACKAGES;
 
   /**
-   * The number of structural features of the '<em>CDO Eager Package Registry Def</em>' class. <!-- begin-user-doc -->
+   * The number of structural features of the '<em>CDO Eager Package Registry Def</em>' class.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int CDO_EAGER_PACKAGE_REGISTRY_DEF_FEATURE_COUNT = CDO_PACKAGE_REGISTRY_DEF_FEATURE_COUNT + 0;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOLazyPackageRegistryDefImpl
-   * <em>CDO Lazy Package Registry Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOLazyPackageRegistryDefImpl <em>CDO Lazy Package Registry Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.defs.impl.CDOLazyPackageRegistryDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOLazyPackageRegistryDef()
    * @generated
@@ -273,18 +266,18 @@ public interface CDODefsPackage extends EPackage
   int CDO_LAZY_PACKAGE_REGISTRY_DEF = 6;
 
   /**
-   * The feature id for the '<em><b>Packages</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Packages</b></em>' containment reference list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int CDO_LAZY_PACKAGE_REGISTRY_DEF__PACKAGES = CDO_PACKAGE_REGISTRY_DEF__PACKAGES;
 
   /**
-   * The number of structural features of the '<em>CDO Lazy Package Registry Def</em>' class. <!-- begin-user-doc -->
+   * The number of structural features of the '<em>CDO Lazy Package Registry Def</em>' class.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
@@ -293,7 +286,6 @@ public interface CDODefsPackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.EPackageDefImpl <em>EPackage Def</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @see org.eclipse.emf.cdo.defs.impl.EPackageDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getEPackageDef()
    * @generated
@@ -301,8 +293,8 @@ public interface CDODefsPackage extends EPackage
   int EPACKAGE_DEF = 7;
 
   /**
-   * The feature id for the '<em><b>Ns URI</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Ns URI</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -318,9 +310,8 @@ public interface CDODefsPackage extends EPackage
   int EPACKAGE_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl
-   * <em>EDynamic Package Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl <em>EDynamic Package Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getEDynamicPackageDef()
    * @generated
@@ -328,34 +319,33 @@ public interface CDODefsPackage extends EPackage
   int EDYNAMIC_PACKAGE_DEF = 8;
 
   /**
-   * The feature id for the '<em><b>Ns URI</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Ns URI</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int EDYNAMIC_PACKAGE_DEF__NS_URI = EPACKAGE_DEF__NS_URI;
 
   /**
-   * The feature id for the '<em><b>Resource URI</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Resource URI</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int EDYNAMIC_PACKAGE_DEF__RESOURCE_URI = EPACKAGE_DEF_FEATURE_COUNT + 0;
 
   /**
-   * The number of structural features of the '<em>EDynamic Package Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>EDynamic Package Def</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int EDYNAMIC_PACKAGE_DEF_FEATURE_COUNT = EPACKAGE_DEF_FEATURE_COUNT + 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.EGlobalPackageDefImpl
-   * <em>EGlobal Package Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.EGlobalPackageDefImpl <em>EGlobal Package Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.defs.impl.EGlobalPackageDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getEGlobalPackageDef()
    * @generated
@@ -363,26 +353,25 @@ public interface CDODefsPackage extends EPackage
   int EGLOBAL_PACKAGE_DEF = 9;
 
   /**
-   * The feature id for the '<em><b>Ns URI</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Ns URI</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int EGLOBAL_PACKAGE_DEF__NS_URI = EPACKAGE_DEF__NS_URI;
 
   /**
-   * The number of structural features of the '<em>EGlobal Package Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>EGlobal Package Def</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int EGLOBAL_PACKAGE_DEF_FEATURE_COUNT = EPACKAGE_DEF_FEATURE_COUNT + 0;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOClientProtocolFactoryDefImpl
-   * <em>CDO Client Protocol Factory Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOClientProtocolFactoryDefImpl <em>CDO Client Protocol Factory Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.defs.impl.CDOClientProtocolFactoryDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOClientProtocolFactoryDef()
    * @generated
@@ -390,18 +379,17 @@ public interface CDODefsPackage extends EPackage
   int CDO_CLIENT_PROTOCOL_FACTORY_DEF = 10;
 
   /**
-   * The number of structural features of the '<em>CDO Client Protocol Factory Def</em>' class. <!-- begin-user-doc -->
+   * The number of structural features of the '<em>CDO Client Protocol Factory Def</em>' class.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int CDO_CLIENT_PROTOCOL_FACTORY_DEF_FEATURE_COUNT = Net4jDefsPackage.CLIENT_PROTOCOL_FACTORY_DEF_FEATURE_COUNT + 0;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl <em>CDO Resource Def</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl <em>CDO Resource Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl
    * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOResourceDef()
    * @generated
@@ -409,33 +397,33 @@ public interface CDODefsPackage extends EPackage
   int CDO_RESOURCE_DEF = 11;
 
   /**
-   * The feature id for the '<em><b>Cdo Transaction</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Cdo Transaction</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int CDO_RESOURCE_DEF__CDO_TRANSACTION = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
 
   /**
-   * The feature id for the '<em><b>Resource Mode</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Resource Mode</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int CDO_RESOURCE_DEF__RESOURCE_MODE = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
 
   /**
-   * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Path</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int CDO_RESOURCE_DEF__PATH = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 2;
 
   /**
-   * The number of structural features of the '<em>CDO Resource Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>CDO Resource Def</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
@@ -462,9 +450,8 @@ public interface CDODefsPackage extends EPackage
   EClass getCDOViewDef();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOViewDef#getCdoSessionDef
-   * <em>Cdo Session Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOViewDef#getCdoSessionDef <em>Cdo Session Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the reference '<em>Cdo Session Def</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOViewDef#getCdoSessionDef()
    * @see #getCDOViewDef()
@@ -473,9 +460,8 @@ public interface CDODefsPackage extends EPackage
   EReference getCDOViewDef_CdoSessionDef();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOTransactionDef <em>CDO Transaction Def</em>}
-   * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOTransactionDef <em>CDO Transaction Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>CDO Transaction Def</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOTransactionDef
    * @generated
@@ -493,9 +479,8 @@ public interface CDODefsPackage extends EPackage
   EClass getCDOAuditDef();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOAuditDef#getTimeStamp
-   * <em>Time Stamp</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOAuditDef#getTimeStamp <em>Time Stamp</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Time Stamp</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOAuditDef#getTimeStamp()
    * @see #getCDOAuditDef()
@@ -514,9 +499,8 @@ public interface CDODefsPackage extends EPackage
   EClass getCDOSessionDef();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef
-   * <em>Connector Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the reference '<em>Connector Def</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef()
    * @see #getCDOSessionDef()
@@ -525,9 +509,8 @@ public interface CDODefsPackage extends EPackage
   EReference getCDOSessionDef_ConnectorDef();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getRepositoryName
-   * <em>Repository Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getRepositoryName <em>Repository Name</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Repository Name</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOSessionDef#getRepositoryName()
    * @see #getCDOSessionDef()
@@ -536,9 +519,8 @@ public interface CDODefsPackage extends EPackage
   EAttribute getCDOSessionDef_RepositoryName();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getCdoPackageRegistryDef
-   * <em>Cdo Package Registry Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getCdoPackageRegistryDef <em>Cdo Package Registry Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the reference '<em>Cdo Package Registry Def</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOSessionDef#getCdoPackageRegistryDef()
    * @see #getCDOSessionDef()
@@ -547,9 +529,8 @@ public interface CDODefsPackage extends EPackage
   EReference getCDOSessionDef_CdoPackageRegistryDef();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#isLegacySupportEnabled
-   * <em>Legacy Support Enabled</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#isLegacySupportEnabled <em>Legacy Support Enabled</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Legacy Support Enabled</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOSessionDef#isLegacySupportEnabled()
    * @see #getCDOSessionDef()
@@ -558,9 +539,8 @@ public interface CDODefsPackage extends EPackage
   EAttribute getCDOSessionDef_LegacySupportEnabled();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef
-   * <em>CDO Package Registry Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef <em>CDO Package Registry Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>CDO Package Registry Def</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOPackageRegistryDef
    * @generated
@@ -568,10 +548,9 @@ public interface CDODefsPackage extends EPackage
   EClass getCDOPackageRegistryDef();
 
   /**
-   * Returns the meta object for the containment reference list '
-   * {@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef#getPackages <em>Packages</em>}'. <!-- begin-user-doc --> <!--
+   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef#getPackages <em>Packages</em>}'.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @return the meta object for the containment reference list '<em>Packages</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOPackageRegistryDef#getPackages()
    * @see #getCDOPackageRegistryDef()
@@ -580,9 +559,8 @@ public interface CDODefsPackage extends EPackage
   EReference getCDOPackageRegistryDef_Packages();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOEagerPackageRegistryDef
-   * <em>CDO Eager Package Registry Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOEagerPackageRegistryDef <em>CDO Eager Package Registry Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>CDO Eager Package Registry Def</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOEagerPackageRegistryDef
    * @generated
@@ -590,9 +568,8 @@ public interface CDODefsPackage extends EPackage
   EClass getCDOEagerPackageRegistryDef();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOLazyPackageRegistryDef
-   * <em>CDO Lazy Package Registry Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOLazyPackageRegistryDef <em>CDO Lazy Package Registry Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>CDO Lazy Package Registry Def</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOLazyPackageRegistryDef
    * @generated
@@ -612,7 +589,6 @@ public interface CDODefsPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.EPackageDef#getNsURI <em>Ns URI</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute '<em>Ns URI</em>'.
    * @see org.eclipse.emf.cdo.defs.EPackageDef#getNsURI()
    * @see #getEPackageDef()
@@ -621,9 +597,8 @@ public interface CDODefsPackage extends EPackage
   EAttribute getEPackageDef_NsURI();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef
-   * <em>EDynamic Package Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef <em>EDynamic Package Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>EDynamic Package Def</em>'.
    * @see org.eclipse.emf.cdo.defs.EDynamicPackageDef
    * @generated
@@ -631,9 +606,8 @@ public interface CDODefsPackage extends EPackage
   EClass getEDynamicPackageDef();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef#getResourceURI
-   * <em>Resource URI</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef#getResourceURI <em>Resource URI</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Resource URI</em>'.
    * @see org.eclipse.emf.cdo.defs.EDynamicPackageDef#getResourceURI()
    * @see #getEDynamicPackageDef()
@@ -642,9 +616,8 @@ public interface CDODefsPackage extends EPackage
   EAttribute getEDynamicPackageDef_ResourceURI();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.EGlobalPackageDef <em>EGlobal Package Def</em>}
-   * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.EGlobalPackageDef <em>EGlobal Package Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>EGlobal Package Def</em>'.
    * @see org.eclipse.emf.cdo.defs.EGlobalPackageDef
    * @generated
@@ -652,9 +625,8 @@ public interface CDODefsPackage extends EPackage
   EClass getEGlobalPackageDef();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOClientProtocolFactoryDef
-   * <em>CDO Client Protocol Factory Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.defs.CDOClientProtocolFactoryDef <em>CDO Client Protocol Factory Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>CDO Client Protocol Factory Def</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOClientProtocolFactoryDef
    * @generated
@@ -672,9 +644,8 @@ public interface CDODefsPackage extends EPackage
   EClass getCDOResourceDef();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getCdoTransaction
-   * <em>Cdo Transaction</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getCdoTransaction <em>Cdo Transaction</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the reference '<em>Cdo Transaction</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOResourceDef#getCdoTransaction()
    * @see #getCDOResourceDef()
@@ -683,9 +654,8 @@ public interface CDODefsPackage extends EPackage
   EReference getCDOResourceDef_CdoTransaction();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getResourceMode
-   * <em>Resource Mode</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getResourceMode <em>Resource Mode</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Resource Mode</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOResourceDef#getResourceMode()
    * @see #getCDOResourceDef()
@@ -696,7 +666,6 @@ public interface CDODefsPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getPath <em>Path</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute '<em>Path</em>'.
    * @see org.eclipse.emf.cdo.defs.CDOResourceDef#getPath()
    * @see #getCDOResourceDef()
@@ -715,8 +684,8 @@ public interface CDODefsPackage extends EPackage
   EEnum getResourceMode();
 
   /**
-   * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the factory that creates the instances of the model.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the factory that creates the instances of the model.
    * @generated
    */
@@ -731,15 +700,13 @@ public interface CDODefsPackage extends EPackage
    * <li>and each data type</li>
    * </ul>
    * <!-- end-user-doc -->
-   * 
    * @generated
    */
   interface Literals
   {
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOViewDefImpl <em>CDO View Def</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOViewDefImpl <em>CDO View Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.emf.cdo.defs.impl.CDOViewDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOViewDef()
      * @generated
@@ -747,17 +714,16 @@ public interface CDODefsPackage extends EPackage
     EClass CDO_VIEW_DEF = eINSTANCE.getCDOViewDef();
 
     /**
-     * The meta object literal for the '<em><b>Cdo Session Def</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Cdo Session Def</b></em>' reference feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EReference CDO_VIEW_DEF__CDO_SESSION_DEF = eINSTANCE.getCDOViewDef_CdoSessionDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl
-     * <em>CDO Transaction Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl <em>CDO Transaction Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOTransactionDef()
      * @generated
@@ -765,9 +731,8 @@ public interface CDODefsPackage extends EPackage
     EClass CDO_TRANSACTION_DEF = eINSTANCE.getCDOTransactionDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl <em>CDO Audit Def</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl <em>CDO Audit Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOAuditDef()
      * @generated
@@ -775,17 +740,16 @@ public interface CDODefsPackage extends EPackage
     EClass CDO_AUDIT_DEF = eINSTANCE.getCDOAuditDef();
 
     /**
-     * The meta object literal for the '<em><b>Time Stamp</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Time Stamp</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute CDO_AUDIT_DEF__TIME_STAMP = eINSTANCE.getCDOAuditDef_TimeStamp();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl <em>CDO Session Def</em>}
-     * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl <em>CDO Session Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOSessionDef()
      * @generated
@@ -793,41 +757,40 @@ public interface CDODefsPackage extends EPackage
     EClass CDO_SESSION_DEF = eINSTANCE.getCDOSessionDef();
 
     /**
-     * The meta object literal for the '<em><b>Connector Def</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Connector Def</b></em>' reference feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EReference CDO_SESSION_DEF__CONNECTOR_DEF = eINSTANCE.getCDOSessionDef_ConnectorDef();
 
     /**
-     * The meta object literal for the '<em><b>Repository Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Repository Name</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute CDO_SESSION_DEF__REPOSITORY_NAME = eINSTANCE.getCDOSessionDef_RepositoryName();
 
     /**
-     * The meta object literal for the '<em><b>Cdo Package Registry Def</b></em>' reference feature. <!-- begin-user-doc
+     * The meta object literal for the '<em><b>Cdo Package Registry Def</b></em>' reference feature.
+     * <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
      * @generated
      */
     EReference CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF = eINSTANCE.getCDOSessionDef_CdoPackageRegistryDef();
 
     /**
-     * The meta object literal for the '<em><b>Legacy Support Enabled</b></em>' attribute feature. <!-- begin-user-doc
+     * The meta object literal for the '<em><b>Legacy Support Enabled</b></em>' attribute feature.
+     * <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
      * @generated
      */
     EAttribute CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED = eINSTANCE.getCDOSessionDef_LegacySupportEnabled();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl
-     * <em>CDO Package Registry Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl <em>CDO Package Registry Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOPackageRegistryDef()
      * @generated
@@ -843,9 +806,8 @@ public interface CDODefsPackage extends EPackage
     EReference CDO_PACKAGE_REGISTRY_DEF__PACKAGES = eINSTANCE.getCDOPackageRegistryDef_Packages();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOEagerPackageRegistryDefImpl
-     * <em>CDO Eager Package Registry Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOEagerPackageRegistryDefImpl <em>CDO Eager Package Registry Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.emf.cdo.defs.impl.CDOEagerPackageRegistryDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOEagerPackageRegistryDef()
      * @generated
@@ -853,9 +815,8 @@ public interface CDODefsPackage extends EPackage
     EClass CDO_EAGER_PACKAGE_REGISTRY_DEF = eINSTANCE.getCDOEagerPackageRegistryDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOLazyPackageRegistryDefImpl
-     * <em>CDO Lazy Package Registry Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOLazyPackageRegistryDefImpl <em>CDO Lazy Package Registry Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.emf.cdo.defs.impl.CDOLazyPackageRegistryDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOLazyPackageRegistryDef()
      * @generated
@@ -863,9 +824,8 @@ public interface CDODefsPackage extends EPackage
     EClass CDO_LAZY_PACKAGE_REGISTRY_DEF = eINSTANCE.getCDOLazyPackageRegistryDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.EPackageDefImpl <em>EPackage Def</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.EPackageDefImpl <em>EPackage Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.emf.cdo.defs.impl.EPackageDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getEPackageDef()
      * @generated
@@ -873,17 +833,16 @@ public interface CDODefsPackage extends EPackage
     EClass EPACKAGE_DEF = eINSTANCE.getEPackageDef();
 
     /**
-     * The meta object literal for the '<em><b>Ns URI</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Ns URI</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute EPACKAGE_DEF__NS_URI = eINSTANCE.getEPackageDef_NsURI();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl
-     * <em>EDynamic Package Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl <em>EDynamic Package Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getEDynamicPackageDef()
      * @generated
@@ -891,17 +850,16 @@ public interface CDODefsPackage extends EPackage
     EClass EDYNAMIC_PACKAGE_DEF = eINSTANCE.getEDynamicPackageDef();
 
     /**
-     * The meta object literal for the '<em><b>Resource URI</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Resource URI</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute EDYNAMIC_PACKAGE_DEF__RESOURCE_URI = eINSTANCE.getEDynamicPackageDef_ResourceURI();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.EGlobalPackageDefImpl
-     * <em>EGlobal Package Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.EGlobalPackageDefImpl <em>EGlobal Package Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.emf.cdo.defs.impl.EGlobalPackageDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getEGlobalPackageDef()
      * @generated
@@ -909,9 +867,8 @@ public interface CDODefsPackage extends EPackage
     EClass EGLOBAL_PACKAGE_DEF = eINSTANCE.getEGlobalPackageDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOClientProtocolFactoryDefImpl
-     * <em>CDO Client Protocol Factory Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOClientProtocolFactoryDefImpl <em>CDO Client Protocol Factory Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.emf.cdo.defs.impl.CDOClientProtocolFactoryDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOClientProtocolFactoryDef()
      * @generated
@@ -919,9 +876,8 @@ public interface CDODefsPackage extends EPackage
     EClass CDO_CLIENT_PROTOCOL_FACTORY_DEF = eINSTANCE.getCDOClientProtocolFactoryDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl
-     * <em>CDO Resource Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl <em>CDO Resource Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl
      * @see org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl#getCDOResourceDef()
      * @generated
@@ -929,25 +885,25 @@ public interface CDODefsPackage extends EPackage
     EClass CDO_RESOURCE_DEF = eINSTANCE.getCDOResourceDef();
 
     /**
-     * The meta object literal for the '<em><b>Cdo Transaction</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Cdo Transaction</b></em>' reference feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EReference CDO_RESOURCE_DEF__CDO_TRANSACTION = eINSTANCE.getCDOResourceDef_CdoTransaction();
 
     /**
-     * The meta object literal for the '<em><b>Resource Mode</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Resource Mode</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute CDO_RESOURCE_DEF__RESOURCE_MODE = eINSTANCE.getCDOResourceDef_ResourceMode();
 
     /**
-     * The meta object literal for the '<em><b>Path</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Path</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute CDO_RESOURCE_DEF__PATH = eINSTANCE.getCDOResourceDef_Path();
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOEagerPackageRegistryDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOEagerPackageRegistryDef.java
index 1ee36599fb..fabd6780cc 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOEagerPackageRegistryDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOEagerPackageRegistryDef.java
@@ -14,7 +14,8 @@ package org.eclipse.emf.cdo.defs;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Eager Package Registry Def</b></em>'. <!--
  * end-user-doc -->
- * 
+ *
+ *
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOEagerPackageRegistryDef()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOLazyPackageRegistryDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOLazyPackageRegistryDef.java
index 90ad26cc4f..9f10328b5d 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOLazyPackageRegistryDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOLazyPackageRegistryDef.java
@@ -14,7 +14,8 @@ package org.eclipse.emf.cdo.defs;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Lazy Package Registry Def</b></em>'. <!--
  * end-user-doc -->
- * 
+ *
+ *
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOLazyPackageRegistryDef()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOPackageRegistryDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOPackageRegistryDef.java
index 0d828d8fae..ed9ef8db22 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOPackageRegistryDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOPackageRegistryDef.java
@@ -18,13 +18,14 @@ import org.eclipse.emf.common.util.EList;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Package Registry Def</b></em>'. <!--
  * end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef#getPackages <em>Packages</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef#getPackages <em>Packages</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOPackageRegistryDef()
  * @model
  * @generated
@@ -32,14 +33,14 @@ import org.eclipse.emf.common.util.EList;
 public interface CDOPackageRegistryDef extends Def
 {
   /**
-   * Returns the value of the '<em><b>Packages</b></em>' containment reference list. The list contents are of type
-   * {@link org.eclipse.emf.cdo.defs.EPackageDef}. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Packages</b></em>' containment reference list.
+   * The list contents are of type {@link org.eclipse.emf.cdo.defs.EPackageDef}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Packages</em>' containment reference list isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Packages</em>' containment reference list.
    * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOPackageRegistryDef_Packages()
    * @model containment="true"
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOResourceDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOResourceDef.java
index 0b5fa42d59..a38dfb9288 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOResourceDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOResourceDef.java
@@ -32,13 +32,13 @@ import org.eclipse.net4j.util.defs.Def;
 public interface CDOResourceDef extends Def
 {
   /**
-   * Returns the value of the '<em><b>Cdo Transaction</b></em>' reference. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Cdo Transaction</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Cdo Transaction</em>' reference isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Cdo Transaction</em>' reference.
    * @see #setCdoTransaction(CDOTransactionDef)
    * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOResourceDef_CdoTransaction()
@@ -48,25 +48,24 @@ public interface CDOResourceDef extends Def
   CDOTransactionDef getCdoTransaction();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getCdoTransaction <em>Cdo Transaction</em>}'
-   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Cdo Transaction</em>' reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getCdoTransaction <em>Cdo Transaction</em>}' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>Cdo Transaction</em>' reference.
    * @see #getCdoTransaction()
    * @generated
    */
   void setCdoTransaction(CDOTransactionDef value);
 
   /**
-   * Returns the value of the '<em><b>Resource Mode</b></em>' attribute. The default value is <code>"null"</code>. The
-   * literals are from the enumeration {@link org.eclipse.emf.cdo.defs.ResourceMode}. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Resource Mode</b></em>' attribute.
+   * The default value is <code>"null"</code>.
+   * The literals are from the enumeration {@link org.eclipse.emf.cdo.defs.ResourceMode}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Resource Mode</em>' attribute isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Resource Mode</em>' attribute.
    * @see org.eclipse.emf.cdo.defs.ResourceMode
    * @see #setResourceMode(ResourceMode)
@@ -77,11 +76,9 @@ public interface CDOResourceDef extends Def
   ResourceMode getResourceMode();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getResourceMode <em>Resource Mode</em>}'
-   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Resource Mode</em>' attribute.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOResourceDef#getResourceMode <em>Resource Mode</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>Resource Mode</em>' attribute.
    * @see org.eclipse.emf.cdo.defs.ResourceMode
    * @see #getResourceMode()
    * @generated
@@ -89,12 +86,12 @@ public interface CDOResourceDef extends Def
   void setResourceMode(ResourceMode value);
 
   /**
-   * Returns the value of the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Path</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Path</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Path</em>' attribute.
    * @see #setPath(String)
    * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOResourceDef_Path()
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOSessionDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOSessionDef.java
index c81c8b6316..25c96eb17b 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOSessionDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOSessionDef.java
@@ -16,16 +16,17 @@ import org.eclipse.net4j.util.defs.Def;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Session Def</b></em>'. <!-- end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getRepositoryName <em>Repository Name</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getCdoPackageRegistryDef <em>Cdo Package Registry Def</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#isLegacySupportEnabled <em>Legacy Support Enabled</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getRepositoryName <em>Repository Name</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getCdoPackageRegistryDef <em>Cdo Package Registry Def</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.defs.CDOSessionDef#isLegacySupportEnabled <em>Legacy Support Enabled</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOSessionDef()
  * @model
  * @generated
@@ -33,13 +34,13 @@ import org.eclipse.net4j.util.defs.Def;
 public interface CDOSessionDef extends Def
 {
   /**
-   * Returns the value of the '<em><b>Connector Def</b></em>' reference. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Connector Def</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Connector Def</em>' reference isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Connector Def</em>' reference.
    * @see #isSetConnectorDef()
    * @see #unsetConnectorDef()
@@ -51,11 +52,9 @@ public interface CDOSessionDef extends Def
   ConnectorDef getConnectorDef();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}'
-   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Connector Def</em>' reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>Connector Def</em>' reference.
    * @see #isSetConnectorDef()
    * @see #unsetConnectorDef()
    * @see #getConnectorDef()
@@ -64,9 +63,8 @@ public interface CDOSessionDef extends Def
   void setConnectorDef(ConnectorDef value);
 
   /**
-   * Unsets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}'
-   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Unsets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #isSetConnectorDef()
    * @see #getConnectorDef()
    * @see #setConnectorDef(ConnectorDef)
@@ -75,9 +73,8 @@ public interface CDOSessionDef extends Def
   void unsetConnectorDef();
 
   /**
-   * Returns whether the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef
-   * <em>Connector Def</em>}' reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns whether the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getConnectorDef <em>Connector Def</em>}' reference is set.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return whether the value of the '<em>Connector Def</em>' reference is set.
    * @see #unsetConnectorDef()
    * @see #getConnectorDef()
@@ -87,13 +84,13 @@ public interface CDOSessionDef extends Def
   boolean isSetConnectorDef();
 
   /**
-   * Returns the value of the '<em><b>Repository Name</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Repository Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>CDORepositoryInfo Name</em>' attribute isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Repository Name</em>' attribute.
    * @see #setRepositoryName(String)
    * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOSessionDef_RepositoryName()
@@ -103,24 +100,22 @@ public interface CDOSessionDef extends Def
   String getRepositoryName();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getRepositoryName <em>Repository Name</em>}'
-   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Repository Name</em>' attribute.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getRepositoryName <em>Repository Name</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>Repository Name</em>' attribute.
    * @see #getRepositoryName()
    * @generated
    */
   void setRepositoryName(String value);
 
   /**
-   * Returns the value of the '<em><b>Cdo Package Registry Def</b></em>' reference. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Cdo Package Registry Def</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Cdo Package Registry Def</em>' reference isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Cdo Package Registry Def</em>' reference.
    * @see #setCdoPackageRegistryDef(CDOPackageRegistryDef)
    * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOSessionDef_CdoPackageRegistryDef()
@@ -130,25 +125,23 @@ public interface CDOSessionDef extends Def
   CDOPackageRegistryDef getCdoPackageRegistryDef();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getCdoPackageRegistryDef
-   * <em>Cdo Package Registry Def</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Cdo Package Registry Def</em>' reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#getCdoPackageRegistryDef <em>Cdo Package Registry Def</em>}' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>Cdo Package Registry Def</em>' reference.
    * @see #getCdoPackageRegistryDef()
    * @generated
    */
   void setCdoPackageRegistryDef(CDOPackageRegistryDef value);
 
   /**
-   * Returns the value of the '<em><b>Legacy Support Enabled</b></em>' attribute. The default value is
-   * <code>"false"</code>. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Legacy Support Enabled</b></em>' attribute.
+   * The default value is <code>"false"</code>.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Legacy Support Enabled</em>' attribute isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Legacy Support Enabled</em>' attribute.
    * @see #setLegacySupportEnabled(boolean)
    * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOSessionDef_LegacySupportEnabled()
@@ -158,11 +151,9 @@ public interface CDOSessionDef extends Def
   boolean isLegacySupportEnabled();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#isLegacySupportEnabled
-   * <em>Legacy Support Enabled</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Legacy Support Enabled</em>' attribute.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOSessionDef#isLegacySupportEnabled <em>Legacy Support Enabled</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>Legacy Support Enabled</em>' attribute.
    * @see #isLegacySupportEnabled()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOViewDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOViewDef.java
index 7c1a4134f3..34df0174de 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOViewDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/CDOViewDef.java
@@ -15,13 +15,14 @@ import org.eclipse.net4j.util.defs.Def;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO View Def</b></em>'. <!-- end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.defs.CDOViewDef#getCdoSessionDef <em>Cdo Session Def</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.defs.CDOViewDef#getCdoSessionDef <em>Cdo Session Def</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOViewDef()
  * @model
  * @generated
@@ -29,13 +30,13 @@ import org.eclipse.net4j.util.defs.Def;
 public interface CDOViewDef extends Def
 {
   /**
-   * Returns the value of the '<em><b>Cdo Session Def</b></em>' reference. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Cdo Session Def</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Cdo Session Def</em>' reference isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Cdo Session Def</em>' reference.
    * @see #setCdoSessionDef(CDOSessionDef)
    * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getCDOViewDef_CdoSessionDef()
@@ -45,11 +46,9 @@ public interface CDOViewDef extends Def
   CDOSessionDef getCdoSessionDef();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOViewDef#getCdoSessionDef <em>Cdo Session Def</em>}'
-   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Cdo Session Def</em>' reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.CDOViewDef#getCdoSessionDef <em>Cdo Session Def</em>}' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>Cdo Session Def</em>' reference.
    * @see #getCdoSessionDef()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EDynamicPackageDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EDynamicPackageDef.java
index 418c69aaff..3d573cfd6a 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EDynamicPackageDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EDynamicPackageDef.java
@@ -14,13 +14,14 @@ package org.eclipse.emf.cdo.defs;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Dynamic CDO Package Def</b></em>'. <!--
  * end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef#getResourceURI <em>Resource URI</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef#getResourceURI <em>Resource URI</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getEDynamicPackageDef()
  * @model
  * @generated
@@ -28,13 +29,13 @@ package org.eclipse.emf.cdo.defs;
 public interface EDynamicPackageDef extends EPackageDef
 {
   /**
-   * Returns the value of the '<em><b>Resource URI</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Resource URI</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Resource URI</em>' attribute isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Resource URI</em>' attribute.
    * @see #setResourceURI(String)
    * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getEDynamicPackageDef_ResourceURI()
@@ -44,11 +45,9 @@ public interface EDynamicPackageDef extends EPackageDef
   String getResourceURI();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef#getResourceURI <em>Resource URI</em>}'
-   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Resource URI</em>' attribute.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef#getResourceURI <em>Resource URI</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>Resource URI</em>' attribute.
    * @see #getResourceURI()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EGlobalPackageDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EGlobalPackageDef.java
index 033fde40ee..9ddc81b816 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EGlobalPackageDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EGlobalPackageDef.java
@@ -14,7 +14,8 @@ package org.eclipse.emf.cdo.defs;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Native CDO Package Def</b></em>'. <!--
  * end-user-doc -->
- * 
+ *
+ *
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getEGlobalPackageDef()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EPackageDef.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EPackageDef.java
index f424752405..07e9fab892 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EPackageDef.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/EPackageDef.java
@@ -15,13 +15,14 @@ import org.eclipse.net4j.util.defs.Def;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Package Def</b></em>'. <!-- end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.defs.EPackageDef#getNsURI <em>Ns URI</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.defs.EPackageDef#getNsURI <em>Ns URI</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getEPackageDef()
  * @model abstract="true"
  * @generated
@@ -29,12 +30,12 @@ import org.eclipse.net4j.util.defs.Def;
 public interface EPackageDef extends Def
 {
   /**
-   * Returns the value of the '<em><b>Ns URI</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Ns URI</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Ns URI</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Ns URI</em>' attribute.
    * @see #setNsURI(String)
    * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getEPackageDef_NsURI()
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/ResourceMode.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/ResourceMode.java
index 4d5c31f8b4..374692b6eb 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/ResourceMode.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/ResourceMode.java
@@ -23,7 +23,6 @@ import java.util.List;
 /**
  * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Resource Mode</b></em>', and
  * utility methods for working with them. <!-- end-user-doc -->
- * 
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage#getResourceMode()
  * @model
  * @generated
@@ -80,13 +79,13 @@ public enum ResourceMode implements Enumerator
   };
 
   /**
-   * The '<em><b>GET</b></em>' literal value. <!-- begin-user-doc -->
+   * The '<em><b>GET</b></em>' literal value.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of '<em><b>GET</b></em>' literal object isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @see #GET
    * @model
    * @generated
@@ -95,13 +94,13 @@ public enum ResourceMode implements Enumerator
   public static final int GET_VALUE = 0;
 
   /**
-   * The '<em><b>CREATE</b></em>' literal value. <!-- begin-user-doc -->
+   * The '<em><b>CREATE</b></em>' literal value.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of '<em><b>CREATE</b></em>' literal object isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @see #CREATE
    * @model
    * @generated
@@ -110,13 +109,13 @@ public enum ResourceMode implements Enumerator
   public static final int CREATE_VALUE = 0;
 
   /**
-   * The '<em><b>GET OR CREATE</b></em>' literal value. <!-- begin-user-doc -->
+   * The '<em><b>GET OR CREATE</b></em>' literal value.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of '<em><b>GET OR CREATE</b></em>' literal object isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @see #GET_OR_CREATE
    * @model
    * @generated
@@ -125,24 +124,24 @@ public enum ResourceMode implements Enumerator
   public static final int GET_OR_CREATE_VALUE = 0;
 
   /**
-   * An array of all the '<em><b>Resource Mode</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * An array of all the '<em><b>Resource Mode</b></em>' enumerators.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   private static final ResourceMode[] VALUES_ARRAY = new ResourceMode[] { GET, CREATE, GET_OR_CREATE, };
 
   /**
-   * A public read-only list of all the '<em><b>Resource Mode</b></em>' enumerators. <!-- begin-user-doc --> <!--
+   * A public read-only list of all the '<em><b>Resource Mode</b></em>' enumerators.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    */
   public static final List<ResourceMode> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
   /**
-   * Returns the '<em><b>Resource Mode</b></em>' literal with the specified literal value. <!-- begin-user-doc --> <!--
+   * Returns the '<em><b>Resource Mode</b></em>' literal with the specified literal value.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    */
   public static ResourceMode get(String literal)
@@ -159,9 +158,9 @@ public enum ResourceMode implements Enumerator
   }
 
   /**
-   * Returns the '<em><b>Resource Mode</b></em>' literal with the specified name. <!-- begin-user-doc --> <!--
+   * Returns the '<em><b>Resource Mode</b></em>' literal with the specified name.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    */
   public static ResourceMode getByName(String name)
@@ -178,9 +177,9 @@ public enum ResourceMode implements Enumerator
   }
 
   /**
-   * Returns the '<em><b>Resource Mode</b></em>' literal with the specified integer value. <!-- begin-user-doc --> <!--
+   * Returns the '<em><b>Resource Mode</b></em>' literal with the specified integer value.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    */
   public static ResourceMode get(int value)
@@ -195,28 +194,25 @@ public enum ResourceMode implements Enumerator
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private final int value;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private final String name;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private final String literal;
 
   /**
-   * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Only this class can construct instances.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   private ResourceMode(int value, String name, String literal)
@@ -228,7 +224,6 @@ public enum ResourceMode implements Enumerator
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public int getValue()
@@ -238,7 +233,6 @@ public enum ResourceMode implements Enumerator
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getName()
@@ -248,7 +242,6 @@ public enum ResourceMode implements Enumerator
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getLiteral()
@@ -257,9 +250,9 @@ public enum ResourceMode implements Enumerator
   }
 
   /**
-   * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc --> <!--
+   * Returns the literal value of the enumerator, which is its string representation.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java
index 8cd97b39a7..3087684db0 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java
@@ -28,18 +28,18 @@ import java.util.Date;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl#getTimeStamp <em>Time Stamp</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl#getTimeStamp <em>Time Stamp</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
 {
   /**
-   * The default value of the '{@link #getTimeStamp() <em>Time Stamp</em>}' attribute. <!-- begin-user-doc --> <!--
+   * The default value of the '{@link #getTimeStamp() <em>Time Stamp</em>}' attribute.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getTimeStamp()
    * @generated
    * @ordered
@@ -47,9 +47,9 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
   protected static final Date TIME_STAMP_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getTimeStamp() <em>Time Stamp</em>}' attribute. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getTimeStamp() <em>Time Stamp</em>}' attribute.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getTimeStamp()
    * @generated
    * @ordered
@@ -58,7 +58,6 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected CDOAuditDefImpl()
@@ -68,7 +67,6 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -79,7 +77,6 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Date getTimeStamp()
@@ -89,7 +86,6 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setTimeStamp(Date newTimeStamp)
@@ -103,7 +99,6 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -119,7 +114,6 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -136,7 +130,6 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -153,7 +146,6 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -169,7 +161,6 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOClientProtocolFactoryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOClientProtocolFactoryDefImpl.java
index 382ad62d74..d1c0674435 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOClientProtocolFactoryDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOClientProtocolFactoryDefImpl.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EClass;
  * end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class CDOClientProtocolFactoryDefImpl extends ClientProtocolFactoryDefImpl implements
@@ -32,7 +32,6 @@ public class CDOClientProtocolFactoryDefImpl extends ClientProtocolFactoryDefImp
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected CDOClientProtocolFactoryDefImpl()
@@ -42,7 +41,6 @@ public class CDOClientProtocolFactoryDefImpl extends ClientProtocolFactoryDefImp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java
index 0e4c7e9cd4..a613795c95 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java
@@ -36,14 +36,13 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- * 
  * @generated
  */
 public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 {
   /**
-   * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates the default factory implementation.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public static CDODefsFactory init()
@@ -65,8 +64,8 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
   }
 
   /**
-   * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates an instance of the factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public CDODefsFactoryImpl()
@@ -76,7 +75,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -113,7 +111,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -130,7 +127,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -147,7 +143,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOViewDef createCDOViewDef()
@@ -158,7 +153,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOTransactionDef createCDOTransactionDef()
@@ -169,7 +163,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOAuditDef createCDOAuditDef()
@@ -180,7 +173,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOSessionDef createCDOSessionDef()
@@ -191,7 +183,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOPackageRegistryDef createCDOPackageRegistryDef()
@@ -202,7 +193,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOEagerPackageRegistryDef createCDOEagerPackageRegistryDef()
@@ -213,7 +203,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOLazyPackageRegistryDef createCDOLazyPackageRegistryDef()
@@ -224,7 +213,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EDynamicPackageDef createEDynamicPackageDef()
@@ -235,7 +223,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EGlobalPackageDef createEGlobalPackageDef()
@@ -246,7 +233,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOClientProtocolFactoryDef createCDOClientProtocolFactoryDef()
@@ -257,7 +243,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOResourceDef createCDOResourceDef()
@@ -268,7 +253,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public ResourceMode createResourceModeFromString(EDataType eDataType, String initialValue)
@@ -282,7 +266,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String convertResourceModeToString(EDataType eDataType, Object instanceValue)
@@ -292,7 +275,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDODefsPackage getCDODefsPackage()
@@ -302,7 +284,6 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java
index f595fc5361..e585baa4b0 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java
@@ -39,98 +39,84 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- * 
  * @generated
  */
 public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass cdoViewDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass cdoTransactionDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass cdoAuditDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass cdoSessionDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass cdoPackageRegistryDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass cdoEagerPackageRegistryDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass cdoLazyPackageRegistryDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass ePackageDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass eDynamicPackageDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass eGlobalPackageDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass cdoClientProtocolFactoryDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass cdoResourceDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EEnum resourceModeEEnum = null;
@@ -155,18 +141,17 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private static boolean isInited = false;
 
   /**
    * 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 CDODefsPackage#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 -->
-   * <!-- end-user-doc -->
    * 
+   * <p>This method is used to initialize {@link CDODefsPackage#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 -->
+   * <!-- end-user-doc -->
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -202,7 +187,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getCDOViewDef()
@@ -212,7 +196,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getCDOViewDef_CdoSessionDef()
@@ -222,7 +205,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getCDOTransactionDef()
@@ -232,7 +214,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getCDOAuditDef()
@@ -242,7 +223,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getCDOAuditDef_TimeStamp()
@@ -252,7 +232,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getCDOSessionDef()
@@ -262,7 +241,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getCDOSessionDef_ConnectorDef()
@@ -272,7 +250,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getCDOSessionDef_RepositoryName()
@@ -282,7 +259,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getCDOSessionDef_CdoPackageRegistryDef()
@@ -292,7 +268,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getCDOSessionDef_LegacySupportEnabled()
@@ -302,7 +277,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getCDOPackageRegistryDef()
@@ -312,7 +286,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getCDOPackageRegistryDef_Packages()
@@ -322,7 +295,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getCDOEagerPackageRegistryDef()
@@ -332,7 +304,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getCDOLazyPackageRegistryDef()
@@ -342,7 +313,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getEPackageDef()
@@ -352,7 +322,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getEPackageDef_NsURI()
@@ -362,7 +331,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getEDynamicPackageDef()
@@ -372,7 +340,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getEDynamicPackageDef_ResourceURI()
@@ -382,7 +349,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getEGlobalPackageDef()
@@ -392,7 +358,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getCDOClientProtocolFactoryDef()
@@ -402,7 +367,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getCDOResourceDef()
@@ -412,7 +376,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getCDOResourceDef_CdoTransaction()
@@ -422,7 +385,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getCDOResourceDef_ResourceMode()
@@ -432,7 +394,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getCDOResourceDef_Path()
@@ -442,7 +403,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EEnum getResourceMode()
@@ -452,7 +412,6 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDODefsFactory getCDODefsFactory()
@@ -462,15 +421,14 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private boolean isCreated = false;
 
   /**
-   * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
-   * first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates the meta-model objects for the package.  This method is
+   * guarded to have no affect on any invocation but its first.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public void createPackageContents()
@@ -522,15 +480,14 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private boolean isInitialized = false;
 
   /**
-   * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
-   * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Complete the initialization of the package and its meta-model.  This
+   * method is guarded to have no affect on any invocation but its first.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public void initializePackageContents()
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOEagerPackageRegistryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOEagerPackageRegistryDefImpl.java
index 592399f429..6a22c2537a 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOEagerPackageRegistryDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOEagerPackageRegistryDefImpl.java
@@ -21,14 +21,13 @@ import org.eclipse.emf.ecore.EClass;
  * end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class CDOEagerPackageRegistryDefImpl extends CDOPackageRegistryDefImpl implements CDOEagerPackageRegistryDef
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected CDOEagerPackageRegistryDefImpl()
@@ -38,7 +37,6 @@ public class CDOEagerPackageRegistryDefImpl extends CDOPackageRegistryDefImpl im
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOLazyPackageRegistryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOLazyPackageRegistryDefImpl.java
index f7cb78911c..b39de7143a 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOLazyPackageRegistryDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOLazyPackageRegistryDefImpl.java
@@ -21,14 +21,13 @@ import org.eclipse.emf.ecore.EClass;
  * end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class CDOLazyPackageRegistryDefImpl extends CDOPackageRegistryDefImpl implements CDOLazyPackageRegistryDef
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected CDOLazyPackageRegistryDefImpl()
@@ -38,7 +37,6 @@ public class CDOLazyPackageRegistryDefImpl extends CDOPackageRegistryDefImpl imp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOPackageRegistryDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOPackageRegistryDefImpl.java
index dbcfc48652..7e0bbddcf6 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOPackageRegistryDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOPackageRegistryDefImpl.java
@@ -34,10 +34,10 @@ import java.util.Collection;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl#getPackages <em>Packages</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl#getPackages <em>Packages</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class CDOPackageRegistryDefImpl extends DefImpl implements CDOPackageRegistryDef
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java
index 4284c89839..1ad798cf1a 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java
@@ -44,9 +44,9 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 {
 
   /**
-   * The cached value of the '{@link #getCdoTransaction() <em>Cdo Transaction</em>}' reference. <!-- begin-user-doc -->
+   * The cached value of the '{@link #getCdoTransaction() <em>Cdo Transaction</em>}' reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @see #getCdoTransaction()
    * @generated
    * @ordered
@@ -64,9 +64,9 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
   protected static final ResourceMode RESOURCE_MODE_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getResourceMode() <em>Resource Mode</em>}' attribute. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getResourceMode() <em>Resource Mode</em>}' attribute.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getResourceMode()
    * @generated
    * @ordered
@@ -84,8 +84,8 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
   protected static final String PATH_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getPath() <em>Path</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The cached value of the '{@link #getPath() <em>Path</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #getPath()
    * @generated
    * @ordered
@@ -94,7 +94,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected CDOResourceDefImpl()
@@ -104,7 +103,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -115,7 +113,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOTransactionDef getCdoTransaction()
@@ -136,7 +133,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOTransactionDef basicGetCdoTransaction()
@@ -146,7 +142,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setCdoTransaction(CDOTransactionDef newCdoTransaction)
@@ -160,7 +155,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public ResourceMode getResourceMode()
@@ -170,7 +164,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setResourceMode(ResourceMode newResourceMode)
@@ -184,7 +177,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getPath()
@@ -194,7 +186,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setPath(String newPath)
@@ -207,7 +198,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -229,7 +219,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -252,7 +241,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -275,7 +263,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -295,7 +282,6 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java
index e6b2205e91..f24fdbd31d 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java
@@ -49,9 +49,9 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
 {
   /**
-   * The cached value of the '{@link #getConnectorDef() <em>Connector Def</em>}' reference. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getConnectorDef() <em>Connector Def</em>}' reference.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getConnectorDef()
    * @generated
    * @ordered
@@ -59,17 +59,17 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
   protected ConnectorDef connectorDef;
 
   /**
-   * This is true if the Connector Def reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This is true if the Connector Def reference has been set.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   protected boolean connectorDefESet;
 
   /**
-   * The default value of the '{@link #getRepositoryName() <em>Repository Name</em>}' attribute. <!-- begin-user-doc -->
+   * The default value of the '{@link #getRepositoryName() <em>Repository Name</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @see #getRepositoryName()
    * @generated
    * @ordered
@@ -77,9 +77,9 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
   protected static final String REPOSITORY_NAME_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getRepositoryName() <em>Repository Name</em>}' attribute. <!-- begin-user-doc -->
+   * The cached value of the '{@link #getRepositoryName() <em>Repository Name</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @see #getRepositoryName()
    * @generated
    * @ordered
@@ -119,7 +119,6 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected CDOSessionDefImpl()
@@ -129,7 +128,6 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -140,7 +138,6 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public ConnectorDef getConnectorDef()
@@ -152,10 +149,8 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
       if (connectorDef != oldConnectorDef)
       {
         if (eNotificationRequired())
-        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF,
               oldConnectorDef, connectorDef));
-        }
       }
     }
     return connectorDef;
@@ -163,7 +158,6 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public ConnectorDef basicGetConnectorDef()
@@ -188,7 +182,6 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setConnectorDefGen(ConnectorDef newConnectorDef)
@@ -198,15 +191,12 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     boolean oldConnectorDefESet = connectorDefESet;
     connectorDefESet = true;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF,
           oldConnectorDef, connectorDef, !oldConnectorDefESet));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void unsetConnectorDef()
@@ -216,15 +206,12 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     connectorDef = null;
     connectorDefESet = false;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF,
           oldConnectorDef, null, oldConnectorDefESet));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public boolean isSetConnectorDef()
@@ -234,7 +221,6 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getRepositoryName()
@@ -244,7 +230,6 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setRepositoryName(String newRepositoryName)
@@ -252,15 +237,12 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     String oldRepositoryName = repositoryName;
     repositoryName = newRepositoryName;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME,
           oldRepositoryName, repositoryName));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOPackageRegistryDef getCdoPackageRegistryDef()
@@ -272,10 +254,8 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
       if (cdoPackageRegistryDef != oldCdoPackageRegistryDef)
       {
         if (eNotificationRequired())
-        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF, oldCdoPackageRegistryDef, cdoPackageRegistryDef));
-        }
       }
     }
     return cdoPackageRegistryDef;
@@ -283,7 +263,6 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOPackageRegistryDef basicGetCdoPackageRegistryDef()
@@ -293,7 +272,6 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setCdoPackageRegistryDef(CDOPackageRegistryDef newCdoPackageRegistryDef)
@@ -301,15 +279,12 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     CDOPackageRegistryDef oldCdoPackageRegistryDef = cdoPackageRegistryDef;
     cdoPackageRegistryDef = newCdoPackageRegistryDef;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF,
           oldCdoPackageRegistryDef, cdoPackageRegistryDef));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public boolean isLegacySupportEnabled()
@@ -319,7 +294,6 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setLegacySupportEnabled(boolean newLegacySupportEnabled)
@@ -327,15 +301,12 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     boolean oldLegacySupportEnabled = legacySupportEnabled;
     legacySupportEnabled = newLegacySupportEnabled;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED,
           oldLegacySupportEnabled, legacySupportEnabled));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -345,17 +316,13 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     {
     case CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF:
       if (resolve)
-      {
         return getConnectorDef();
-      }
       return basicGetConnectorDef();
     case CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME:
       return getRepositoryName();
     case CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF:
       if (resolve)
-      {
         return getCdoPackageRegistryDef();
-      }
       return basicGetCdoPackageRegistryDef();
     case CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED:
       return isLegacySupportEnabled();
@@ -365,7 +332,6 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -391,7 +357,6 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -417,7 +382,6 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -440,16 +404,13 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (repositoryName: ");
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOTransactionDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOTransactionDefImpl.java
index 5d65a075e8..d1c6d81b28 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOTransactionDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOTransactionDefImpl.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EClass;
  * end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class CDOTransactionDefImpl extends CDOViewDefImpl implements CDOTransactionDef
@@ -30,7 +30,6 @@ public class CDOTransactionDefImpl extends CDOViewDefImpl implements CDOTransact
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected CDOTransactionDefImpl()
@@ -40,7 +39,6 @@ public class CDOTransactionDefImpl extends CDOViewDefImpl implements CDOTransact
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java
index d52a240d9c..7d3cc82080 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java
@@ -30,19 +30,19 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.defs.impl.CDOViewDefImpl#getCdoSessionDef <em>Cdo Session Def</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.defs.impl.CDOViewDefImpl#getCdoSessionDef <em>Cdo Session Def</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class CDOViewDefImpl extends DefImpl implements CDOViewDef
 {
 
   /**
-   * The cached value of the '{@link #getCdoSessionDef() <em>Cdo Session Def</em>}' reference. <!-- begin-user-doc -->
+   * The cached value of the '{@link #getCdoSessionDef() <em>Cdo Session Def</em>}' reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @see #getCdoSessionDef()
    * @generated
    * @ordered
@@ -51,7 +51,6 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected CDOViewDefImpl()
@@ -61,7 +60,6 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -72,7 +70,6 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOSessionDef getCdoSessionDef()
@@ -93,7 +90,6 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOSessionDef basicGetCdoSessionDef()
@@ -103,7 +99,6 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setCdoSessionDef(CDOSessionDef newCdoSessionDef)
@@ -117,7 +112,6 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -135,7 +129,6 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -152,7 +145,6 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -169,7 +161,6 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java
index 4d0e0b90fc..8de93c8a9f 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java
@@ -26,18 +26,18 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl#getResourceURI <em>Resource URI</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl#getResourceURI <em>Resource URI</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicPackageDef
 {
   /**
-   * The default value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute. <!-- begin-user-doc --> <!--
+   * The default value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getResourceURI()
    * @generated
    * @ordered
@@ -45,9 +45,9 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
   protected static final String RESOURCE_URI_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getResourceURI() <em>Resource URI</em>}' attribute.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getResourceURI()
    * @generated
    * @ordered
@@ -56,7 +56,6 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected EDynamicPackageDefImpl()
@@ -66,7 +65,6 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -77,7 +75,6 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getResourceURI()
@@ -87,7 +84,6 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setResourceURI(String newResourceURI)
@@ -101,7 +97,6 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -117,7 +112,6 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -134,7 +128,6 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -151,7 +144,6 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -167,7 +159,6 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EGlobalPackageDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EGlobalPackageDefImpl.java
index cfe61f901e..e54f3fa328 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EGlobalPackageDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EGlobalPackageDefImpl.java
@@ -22,14 +22,13 @@ import org.eclipse.emf.ecore.EPackage;
  * end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class EGlobalPackageDefImpl extends EPackageDefImpl implements EGlobalPackageDef
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected EGlobalPackageDefImpl()
@@ -39,7 +38,6 @@ public class EGlobalPackageDefImpl extends EPackageDefImpl implements EGlobalPac
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java
index 8f531a5542..a76bdd694b 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java
@@ -59,7 +59,6 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected EPackageDefImpl()
@@ -69,7 +68,6 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -80,7 +78,6 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getNsURI()
@@ -90,7 +87,6 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setNsURI(String newNsURI)
@@ -98,14 +94,11 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
     String oldNsURI = nsURI;
     nsURI = newNsURI;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.EPACKAGE_DEF__NS_URI, oldNsURI, nsURI));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -121,7 +114,6 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -138,7 +130,6 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -155,7 +146,6 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -171,16 +161,13 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (nsURI: ");
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsAdapterFactory.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsAdapterFactory.java
index f07b4b58c4..d8efa4321f 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsAdapterFactory.java
@@ -38,22 +38,21 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
  * method for each class of the model. <!-- end-user-doc -->
- * 
  * @see org.eclipse.emf.cdo.defs.CDODefsPackage
  * @generated
  */
 public class CDODefsAdapterFactory extends AdapterFactoryImpl
 {
   /**
-   * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The cached model package.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected static CDODefsPackage modelPackage;
 
   /**
-   * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates an instance of the adapter factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public CDODefsAdapterFactory()
@@ -65,10 +64,10 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
+   * Returns whether this factory is applicable for the type of the object.
+   * <!-- begin-user-doc --> This implementation
    * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
    * end-user-doc -->
-   * 
    * @return whether this factory is applicable for the type of the object.
    * @generated
    */
@@ -87,8 +86,8 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The switch that delegates to the <code>createXXX</code> methods.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected CDODefsSwitch<Adapter> modelSwitch = new CDODefsSwitch<Adapter>()
@@ -191,10 +190,9 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   };
 
   /**
-   * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param target
-   *          the object to adapt.
+   * Creates an adapter for the <code>target</code>.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param target the object to adapt.
    * @return the adapter for the <code>target</code>.
    * @generated
    */
@@ -208,7 +206,6 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOViewDef <em>CDO View 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.emf.cdo.defs.CDOViewDef
    * @generated
@@ -219,11 +216,10 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOTransactionDef
-   * <em>CDO Transaction Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOTransactionDef <em>CDO Transaction 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.emf.cdo.defs.CDOTransactionDef
    * @generated
@@ -237,7 +233,6 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOAuditDef <em>CDO Audit 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.emf.cdo.defs.CDOAuditDef
    * @generated
@@ -248,10 +243,9 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOSessionDef
-   * <em>CDO Session Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOSessionDef <em>CDO Session 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.emf.cdo.defs.CDOSessionDef
    * @generated
@@ -262,11 +256,10 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef
-   * <em>CDO Package Registry Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOPackageRegistryDef <em>CDO Package Registry 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.emf.cdo.defs.CDOPackageRegistryDef
    * @generated
@@ -277,11 +270,10 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOEagerPackageRegistryDef
-   * <em>CDO Eager Package Registry Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOEagerPackageRegistryDef <em>CDO Eager Package Registry 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.emf.cdo.defs.CDOEagerPackageRegistryDef
    * @generated
@@ -292,11 +284,10 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOLazyPackageRegistryDef
-   * <em>CDO Lazy Package Registry Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOLazyPackageRegistryDef <em>CDO Lazy Package Registry 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.emf.cdo.defs.CDOLazyPackageRegistryDef
    * @generated
@@ -310,7 +301,6 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.EPackageDef <em>EPackage 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.emf.cdo.defs.EPackageDef
    * @generated
@@ -321,11 +311,10 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef
-   * <em>EDynamic Package Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.EDynamicPackageDef <em>EDynamic Package 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.emf.cdo.defs.EDynamicPackageDef
    * @generated
@@ -336,11 +325,10 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.EGlobalPackageDef
-   * <em>EGlobal Package Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.EGlobalPackageDef <em>EGlobal Package 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.emf.cdo.defs.EGlobalPackageDef
    * @generated
@@ -351,11 +339,10 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOClientProtocolFactoryDef
-   * <em>CDO Client Protocol Factory Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOClientProtocolFactoryDef <em>CDO Client Protocol Factory 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.emf.cdo.defs.CDOClientProtocolFactoryDef
    * @generated
@@ -366,10 +353,9 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOResourceDef
-   * <em>CDO Resource Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.defs.CDOResourceDef <em>CDO Resource 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.emf.cdo.defs.CDOResourceDef
    * @generated
@@ -394,11 +380,10 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ProtocolProviderDef
-   * <em>Protocol Provider Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ProtocolProviderDef <em>Protocol Provider 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.defs.ProtocolProviderDef
    * @generated
@@ -409,11 +394,10 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ClientProtocolFactoryDef
-   * <em>Client Protocol Factory Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ClientProtocolFactoryDef <em>Client Protocol Factory 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.defs.ClientProtocolFactoryDef
    * @generated
@@ -424,9 +408,9 @@ public class CDODefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
+   * Creates a new adapter for the default case.
+   * <!-- begin-user-doc --> This default implementation returns null. <!--
    * end-user-doc -->
-   * 
    * @return the new adapter.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java
index ece1371e64..bff59f6701 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java
@@ -113,9 +113,13 @@ public class CDODefsSwitch<T>
       CDOViewDef cdoViewDef = (CDOViewDef)theEObject;
       T result = caseCDOViewDef(cdoViewDef);
       if (result == null)
+      {
         result = caseDef(cdoViewDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.CDO_TRANSACTION_DEF:
@@ -123,11 +127,17 @@ public class CDODefsSwitch<T>
       CDOTransactionDef cdoTransactionDef = (CDOTransactionDef)theEObject;
       T result = caseCDOTransactionDef(cdoTransactionDef);
       if (result == null)
+      {
         result = caseCDOViewDef(cdoTransactionDef);
+      }
       if (result == null)
+      {
         result = caseDef(cdoTransactionDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.CDO_AUDIT_DEF:
@@ -135,11 +145,17 @@ public class CDODefsSwitch<T>
       CDOAuditDef cdoAuditDef = (CDOAuditDef)theEObject;
       T result = caseCDOAuditDef(cdoAuditDef);
       if (result == null)
+      {
         result = caseCDOViewDef(cdoAuditDef);
+      }
       if (result == null)
+      {
         result = caseDef(cdoAuditDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.CDO_SESSION_DEF:
@@ -147,9 +163,13 @@ public class CDODefsSwitch<T>
       CDOSessionDef cdoSessionDef = (CDOSessionDef)theEObject;
       T result = caseCDOSessionDef(cdoSessionDef);
       if (result == null)
+      {
         result = caseDef(cdoSessionDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF:
@@ -157,9 +177,13 @@ public class CDODefsSwitch<T>
       CDOPackageRegistryDef cdoPackageRegistryDef = (CDOPackageRegistryDef)theEObject;
       T result = caseCDOPackageRegistryDef(cdoPackageRegistryDef);
       if (result == null)
+      {
         result = caseDef(cdoPackageRegistryDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.CDO_EAGER_PACKAGE_REGISTRY_DEF:
@@ -167,11 +191,17 @@ public class CDODefsSwitch<T>
       CDOEagerPackageRegistryDef cdoEagerPackageRegistryDef = (CDOEagerPackageRegistryDef)theEObject;
       T result = caseCDOEagerPackageRegistryDef(cdoEagerPackageRegistryDef);
       if (result == null)
+      {
         result = caseCDOPackageRegistryDef(cdoEagerPackageRegistryDef);
+      }
       if (result == null)
+      {
         result = caseDef(cdoEagerPackageRegistryDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.CDO_LAZY_PACKAGE_REGISTRY_DEF:
@@ -179,11 +209,17 @@ public class CDODefsSwitch<T>
       CDOLazyPackageRegistryDef cdoLazyPackageRegistryDef = (CDOLazyPackageRegistryDef)theEObject;
       T result = caseCDOLazyPackageRegistryDef(cdoLazyPackageRegistryDef);
       if (result == null)
+      {
         result = caseCDOPackageRegistryDef(cdoLazyPackageRegistryDef);
+      }
       if (result == null)
+      {
         result = caseDef(cdoLazyPackageRegistryDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.EPACKAGE_DEF:
@@ -191,9 +227,13 @@ public class CDODefsSwitch<T>
       EPackageDef ePackageDef = (EPackageDef)theEObject;
       T result = caseEPackageDef(ePackageDef);
       if (result == null)
+      {
         result = caseDef(ePackageDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.EDYNAMIC_PACKAGE_DEF:
@@ -201,11 +241,17 @@ public class CDODefsSwitch<T>
       EDynamicPackageDef eDynamicPackageDef = (EDynamicPackageDef)theEObject;
       T result = caseEDynamicPackageDef(eDynamicPackageDef);
       if (result == null)
+      {
         result = caseEPackageDef(eDynamicPackageDef);
+      }
       if (result == null)
+      {
         result = caseDef(eDynamicPackageDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.EGLOBAL_PACKAGE_DEF:
@@ -213,11 +259,17 @@ public class CDODefsSwitch<T>
       EGlobalPackageDef eGlobalPackageDef = (EGlobalPackageDef)theEObject;
       T result = caseEGlobalPackageDef(eGlobalPackageDef);
       if (result == null)
+      {
         result = caseEPackageDef(eGlobalPackageDef);
+      }
       if (result == null)
+      {
         result = caseDef(eGlobalPackageDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.CDO_CLIENT_PROTOCOL_FACTORY_DEF:
@@ -225,13 +277,21 @@ public class CDODefsSwitch<T>
       CDOClientProtocolFactoryDef cdoClientProtocolFactoryDef = (CDOClientProtocolFactoryDef)theEObject;
       T result = caseCDOClientProtocolFactoryDef(cdoClientProtocolFactoryDef);
       if (result == null)
+      {
         result = caseClientProtocolFactoryDef(cdoClientProtocolFactoryDef);
+      }
       if (result == null)
+      {
         result = caseProtocolProviderDef(cdoClientProtocolFactoryDef);
+      }
       if (result == null)
+      {
         result = caseDef(cdoClientProtocolFactoryDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.CDO_RESOURCE_DEF:
@@ -239,9 +299,13 @@ public class CDODefsSwitch<T>
       CDOResourceDef cdoResourceDef = (CDOResourceDef)theEObject;
       T result = caseCDOResourceDef(cdoResourceDef);
       if (result == null)
+      {
         result = caseDef(cdoResourceDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/package-info.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/package-info.java
index 84b7c4e23e..ae2882de43 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/package-info.java
@@ -13,3 +13,4 @@
  * Useful base classes that can be referenced from custom EMF generator models.
  */
 package org.eclipse.emf.cdo.edit;
+
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.core.resources.prefs
index e19afd3311..3bfff2351d 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples.company/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,3 @@
-#Mon Jul 04 12:54:45 CEST 2011
 eclipse.preferences.version=1
+encoding//model/company.genmodel=UTF-8
 encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8
diff --git a/plugins/org.eclipse.emf.cdo.examples.company/model/company.genmodel b/plugins/org.eclipse.emf.cdo.examples.company/model/company.genmodel
index 102ca2c934..d04d17b517 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company/model/company.genmodel
+++ b/plugins/org.eclipse.emf.cdo.examples.company/model/company.genmodel
@@ -1,73 +1,72 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Eike Stepper - initial API and implementation"
-    modelDirectory="/org.eclipse.emf.cdo.examples.company/src" creationIcons="false"
-    editDirectory="/org.eclipse.emf.cdo.examples.company.edit/src" editorDirectory=""
-    modelPluginID="org.eclipse.emf.cdo.examples.company" modelName="Company" editPluginClass="org.eclipse.emf.cdo.examples.company.provider.CompanyEditPlugin"
-    editorPluginClass="" updateClasspath="false" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
-    reflectiveDelegation="true" codeFormatting="true" testsDirectory="" testSuiteClass="org.eclipse.emf.cdo.examples.company.tests.CompanyAllTests"
-    importerID="org.eclipse.emf.importer.ecore" featureDelegation="Reflective" complianceLevel="5.0"
-    providerRootExtendsClass="org.eclipse.emf.cdo.edit.CDOItemProviderAdapter" editPluginID="org.eclipse.emf.cdo.examples.company.edit"
-    editorPluginID="org.eclipse.emf.cdo.examples.company.editor" testsPluginID="org.eclipse.emf.cdo.examples.company.editor"
-    optimizedHasChildren="true" tableProviders="true" colorProviders="true" fontProviders="true">
-  <foreignModel>company.ecore</foreignModel>
-  <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
-  <genPackages prefix="Company" basePackage="org.eclipse.emf.cdo.examples" disposableProviderFactory="true"
-      extensibleProviderFactory="true" childCreationExtenders="true" ecorePackage="company.ecore#/">
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="company.ecore#//VAT">
-      <genEnumLiterals ecoreEnumLiteral="company.ecore#//VAT/vat0"/>
-      <genEnumLiterals ecoreEnumLiteral="company.ecore#//VAT/vat7"/>
-      <genEnumLiterals ecoreEnumLiteral="company.ecore#//VAT/vat15"/>
-    </genEnums>
-    <genClasses ecoreClass="company.ecore#//Address">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//Address/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//Address/street"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//Address/city"/>
-    </genClasses>
-    <genClasses ecoreClass="company.ecore#//Company">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference company.ecore#//Company/categories"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference company.ecore#//Company/suppliers"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference company.ecore#//Company/customers"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference company.ecore#//Company/purchaseOrders"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference company.ecore#//Company/salesOrders"/>
-    </genClasses>
-    <genClasses ecoreClass="company.ecore#//Supplier">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference company.ecore#//Supplier/purchaseOrders"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//Supplier/preferred"/>
-    </genClasses>
-    <genClasses ecoreClass="company.ecore#//Customer">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference company.ecore#//Customer/salesOrders"/>
-    </genClasses>
-    <genClasses ecoreClass="company.ecore#//Order">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference company.ecore#//Order/orderDetails"/>
-    </genClasses>
-    <genClasses ecoreClass="company.ecore#//OrderDetail">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference company.ecore#//OrderDetail/order"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference company.ecore#//OrderDetail/product"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//OrderDetail/price"/>
-    </genClasses>
-    <genClasses ecoreClass="company.ecore#//OrderAddress">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//OrderAddress/testAttribute"/>
-    </genClasses>
-    <genClasses ecoreClass="company.ecore#//PurchaseOrder">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//PurchaseOrder/date"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference company.ecore#//PurchaseOrder/supplier"/>
-    </genClasses>
-    <genClasses ecoreClass="company.ecore#//SalesOrder">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//SalesOrder/id"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference company.ecore#//SalesOrder/customer"/>
-    </genClasses>
-    <genClasses ecoreClass="company.ecore#//Category">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//Category/name"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference company.ecore#//Category/categories"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference company.ecore#//Category/products"/>
-    </genClasses>
-    <genClasses ecoreClass="company.ecore#//Product">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//Product/name"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference company.ecore#//Product/orderDetails"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//Product/vat"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//Product/description"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Eike Stepper - initial API and implementation"
+    modelDirectory="/org.eclipse.emf.cdo.examples.company/src" creationIcons="false"
+    editDirectory="/org.eclipse.emf.cdo.examples.company.edit/src" editorDirectory=""
+    modelPluginID="org.eclipse.emf.cdo.examples.company" modelName="Company" editPluginClass="org.eclipse.emf.cdo.examples.company.provider.CompanyEditPlugin"
+    editorPluginClass="" updateClasspath="false" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
+    reflectiveDelegation="true" codeFormatting="true" testsDirectory="" testSuiteClass="org.eclipse.emf.cdo.examples.company.tests.CompanyAllTests"
+    importerID="org.eclipse.emf.importer.ecore" featureDelegation="Reflective" complianceLevel="5.0"
+    providerRootExtendsClass="org.eclipse.emf.cdo.edit.CDOItemProviderAdapter" editPluginID="org.eclipse.emf.cdo.examples.company.edit"
+    editorPluginID="org.eclipse.emf.cdo.examples.company.editor" testsPluginID="org.eclipse.emf.cdo.examples.company.editor"
+    optimizedHasChildren="true" tableProviders="true" colorProviders="true" fontProviders="true"
+    runtimeVersion="2.6">
+  <foreignModel>company.ecore</foreignModel>
+  <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
+  <genPackages prefix="Company" basePackage="org.eclipse.emf.cdo.examples" disposableProviderFactory="true"
+      extensibleProviderFactory="true" childCreationExtenders="true" ecorePackage="company.ecore#/">
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="company.ecore#//VAT">
+      <genEnumLiterals ecoreEnumLiteral="company.ecore#//VAT/vat0"/>
+      <genEnumLiterals ecoreEnumLiteral="company.ecore#//VAT/vat7"/>
+      <genEnumLiterals ecoreEnumLiteral="company.ecore#//VAT/vat15"/>
+    </genEnums>
+    <genClasses image="false" ecoreClass="company.ecore#//Addressable">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//Addressable/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//Addressable/street"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//Addressable/city"/>
+    </genClasses>
+    <genClasses ecoreClass="company.ecore#//Company">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference company.ecore#//Company/categories"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference company.ecore#//Company/suppliers"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference company.ecore#//Company/customers"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference company.ecore#//Company/purchaseOrders"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference company.ecore#//Company/salesOrders"/>
+    </genClasses>
+    <genClasses ecoreClass="company.ecore#//Supplier">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference company.ecore#//Supplier/purchaseOrders"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//Supplier/preferred"/>
+    </genClasses>
+    <genClasses ecoreClass="company.ecore#//Customer">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference company.ecore#//Customer/salesOrders"/>
+    </genClasses>
+    <genClasses ecoreClass="company.ecore#//Order">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference company.ecore#//Order/orderDetails"/>
+    </genClasses>
+    <genClasses ecoreClass="company.ecore#//OrderDetail">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference company.ecore#//OrderDetail/order"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference company.ecore#//OrderDetail/product"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//OrderDetail/price"/>
+    </genClasses>
+    <genClasses ecoreClass="company.ecore#//PurchaseOrder">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//PurchaseOrder/date"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference company.ecore#//PurchaseOrder/supplier"/>
+    </genClasses>
+    <genClasses ecoreClass="company.ecore#//SalesOrder">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//SalesOrder/id"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference company.ecore#//SalesOrder/customer"/>
+    </genClasses>
+    <genClasses ecoreClass="company.ecore#//Category">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//Category/name"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference company.ecore#//Category/categories"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference company.ecore#//Category/products"/>
+    </genClasses>
+    <genClasses ecoreClass="company.ecore#//Product">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//Product/name"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference company.ecore#//Product/orderDetails"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//Product/vat"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//Product/description"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute company.ecore#//Product/price"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/model/article.genmodel b/plugins/org.eclipse.emf.cdo.releng.doc/model/article.genmodel
index dfc8dbe205..d582734288 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/model/article.genmodel
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/model/article.genmodel
@@ -2,48 +2,53 @@
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.cdo.releng.doc/src"
-    modelPluginID="org.eclipse.emf.cdo.releng.doc" modelName="Article" updateClasspath="false"
-    codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
-    copyrightFields="false">
+    editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.cdo.releng.doc"
+    modelName="Article" updateClasspath="false" codeFormatting="true" testsDirectory=""
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
+    runtimeVersion="2.6">
   <foreignModel>article.ecore</foreignModel>
   <genPackages prefix="Article" basePackage="org.eclipse.emf.cdo.releng.doc" disposableProviderFactory="true"
       ecorePackage="article.ecore#/">
     <genDataTypes ecoreDataType="article.ecore#//RootDoc"/>
     <genDataTypes ecoreDataType="article.ecore#//File"/>
     <genDataTypes ecoreDataType="article.ecore#//Doc"/>
+    <genDataTypes ecoreDataType="article.ecore#//Tag"/>
     <genClasses ecoreClass="article.ecore#//Documentation">
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference article.ecore#//Documentation/context"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference article.ecore#//Documentation/embeddableElements"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference article.ecore#//Documentation/dependencies"/>
-      <genOperations ecoreOperation="article.ecore#//Documentation/generate"/>
+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//Documentation/project"/>
+      <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference article.ecore#//Documentation/plugins"/>
     </genClasses>
     <genClasses ecoreClass="article.ecore#//Context">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//Context/baseFolder"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//Context/project"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference article.ecore#//Context/documentations"/>
+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//Context/root"/>
     </genClasses>
     <genClasses ecoreClass="article.ecore#//Category"/>
-    <genClasses ecoreClass="article.ecore#//Article">
-      <genOperations ecoreOperation="article.ecore#//Article/generate"/>
+    <genClasses ecoreClass="article.ecore#//Article"/>
+    <genClasses ecoreClass="article.ecore#//Chapter">
+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference article.ecore#//Chapter/article"/>
     </genClasses>
-    <genClasses ecoreClass="article.ecore#//Chapter"/>
     <genClasses ecoreClass="article.ecore#//Snippet">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference article.ecore#//Snippet/callouts"/>
     </genClasses>
-    <genClasses ecoreClass="article.ecore#//Diagram">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//Diagram/code"/>
-    </genClasses>
+    <genClasses ecoreClass="article.ecore#//Diagram"/>
     <genClasses ecoreClass="article.ecore#//Factory"/>
-    <genClasses ecoreClass="article.ecore#//JavaElement"/>
+    <genClasses ecoreClass="article.ecore#//JavaElement">
+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//JavaElement/classFile"/>
+    </genClasses>
     <genClasses image="false" ecoreClass="article.ecore#//StructuralElement">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference article.ecore#//StructuralElement/children"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference article.ecore#//StructuralElement/parent"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//StructuralElement/title"/>
-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//StructuralElement/path"/>
-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//StructuralElement/outputFile"/>
+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference article.ecore#//StructuralElement/documentation"/>
+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//StructuralElement/doc"/>
     </genClasses>
     <genClasses image="false" ecoreClass="article.ecore#//LinkTarget">
-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//LinkTarget/label"/>
+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//LinkTarget/defaultLabel"/>
+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//LinkTarget/tooltip"/>
       <genOperations ecoreOperation="article.ecore#//LinkTarget/linkFrom">
         <genParameters ecoreParameter="article.ecore#//LinkTarget/linkFrom/source"/>
       </genOperations>
@@ -53,25 +58,24 @@
     </genClasses>
     <genClasses image="false" ecoreClass="article.ecore#//EmbeddableElement">
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference article.ecore#//EmbeddableElement/documentation"/>
-      <genOperations ecoreOperation="article.ecore#//EmbeddableElement/getHtml">
-        <genParameters ecoreParameter="article.ecore#//EmbeddableElement/getHtml/embedder"/>
-      </genOperations>
     </genClasses>
-    <genClasses ecoreClass="article.ecore#//ExternalTarget"/>
+    <genClasses ecoreClass="article.ecore#//ExternalTarget">
+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//ExternalTarget/url"/>
+    </genClasses>
     <genClasses image="false" ecoreClass="article.ecore#//Identifiable">
       <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//Identifiable/id"/>
     </genClasses>
     <genClasses image="false" ecoreClass="article.ecore#//Body">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference article.ecore#//Body/elements"/>
-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//Body/html"/>
+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference article.ecore#//Body/category"/>
     </genClasses>
-    <genClasses image="false" ecoreClass="article.ecore#//BodyElement">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference article.ecore#//BodyElement/body"/>
-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//BodyElement/html"/>
+    <genClasses image="false" ecoreClass="article.ecore#//BodyElementContainer">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference article.ecore#//BodyElementContainer/elements"/>
     </genClasses>
-    <genClasses ecoreClass="article.ecore#//Text">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//Text/value"/>
+    <genClasses image="false" ecoreClass="article.ecore#//BodyElement">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference article.ecore#//BodyElement/container"/>
+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//BodyElement/tag"/>
     </genClasses>
+    <genClasses ecoreClass="article.ecore#//Text"/>
     <genClasses ecoreClass="article.ecore#//Link">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference article.ecore#//Link/target"/>
     </genClasses>
@@ -79,5 +83,28 @@
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference article.ecore#//Embedding/element"/>
     </genClasses>
     <genClasses ecoreClass="article.ecore#//SourceCode"/>
+    <genClasses ecoreClass="article.ecore#//Plugin">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//Plugin/name"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference article.ecore#//Plugin/packages"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//Plugin/label"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference article.ecore#//Plugin/extensionPoints"/>
+    </genClasses>
+    <genClasses ecoreClass="article.ecore#//JavaPackage">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//JavaPackage/name"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference article.ecore#//JavaPackage/plugin"/>
+    </genClasses>
+    <genClasses ecoreClass="article.ecore#//Javadoc"/>
+    <genClasses ecoreClass="article.ecore#//ExternalArticle">
+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//ExternalArticle/url"/>
+    </genClasses>
+    <genClasses ecoreClass="article.ecore#//Schemadoc"/>
+    <genClasses ecoreClass="article.ecore#//ExtensionPoint">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//ExtensionPoint/name"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference article.ecore#//ExtensionPoint/plugin"/>
+    </genClasses>
+    <genClasses ecoreClass="article.ecore#//Toc">
+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute article.ecore#//Toc/levels"/>
+    </genClasses>
+    <genClasses ecoreClass="article.ecore#//PluginResource"/>
   </genPackages>
 </genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java
index 25fef82682..0dba4375e8 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java
@@ -384,9 +384,7 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
   public Context getContext()
   {
     if (eContainerFeatureID() != ArticlePackage.DOCUMENTATION__CONTEXT)
-    {
       return null;
-    }
     return (Context)eContainer();
   }
 
@@ -408,34 +406,24 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
    */
   public void setContext(Context newContext)
   {
-    if (newContext != eInternalContainer() || eContainerFeatureID() != ArticlePackage.DOCUMENTATION__CONTEXT
-        && newContext != null)
+    if (newContext != eInternalContainer()
+        || (eContainerFeatureID() != ArticlePackage.DOCUMENTATION__CONTEXT && newContext != null))
     {
       if (EcoreUtil.isAncestor(this, newContext))
-      {
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-      }
       NotificationChain msgs = null;
       if (eInternalContainer() != null)
-      {
         msgs = eBasicRemoveFromContainer(msgs);
-      }
       if (newContext != null)
-      {
         msgs = ((InternalEObject)newContext).eInverseAdd(this, ArticlePackage.CONTEXT__DOCUMENTATIONS, Context.class,
             msgs);
-      }
       msgs = basicSetContext(newContext, msgs);
       if (msgs != null)
-      {
         msgs.dispatch();
-      }
     }
     else if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.DOCUMENTATION__CONTEXT, newContext,
           newContext));
-    }
   }
 
   /**
@@ -505,9 +493,7 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
     {
     case ArticlePackage.DOCUMENTATION__CONTEXT:
       if (eInternalContainer() != null)
-      {
         msgs = eBasicRemoveFromContainer(msgs);
-      }
       return basicSetContext((Context)otherEnd, msgs);
     case ArticlePackage.DOCUMENTATION__EMBEDDABLE_ELEMENTS:
       return ((InternalEList<InternalEObject>)(InternalEList<?>)getEmbeddableElements()).basicAdd(otherEnd, msgs);
@@ -657,9 +643,7 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (project: ");
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalArticleImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalArticleImpl.java
index b9446ec8f7..5007798984 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalArticleImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalArticleImpl.java
@@ -127,9 +127,7 @@ public class ExternalArticleImpl extends ArticleImpl implements ExternalArticle
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (url: ");
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/StructuralElementImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/StructuralElementImpl.java
index 88085dbaea..a34e46b5d7 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/StructuralElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/StructuralElementImpl.java
@@ -189,9 +189,7 @@ public abstract class StructuralElementImpl extends LinkTargetImpl implements St
   public StructuralElement getParent()
   {
     if (eContainerFeatureID() != ArticlePackage.STRUCTURAL_ELEMENT__PARENT)
-    {
       return null;
-    }
     return (StructuralElement)eContainer();
   }
 
@@ -213,34 +211,24 @@ public abstract class StructuralElementImpl extends LinkTargetImpl implements St
    */
   public void setParent(StructuralElement newParent)
   {
-    if (newParent != eInternalContainer() || eContainerFeatureID() != ArticlePackage.STRUCTURAL_ELEMENT__PARENT
-        && newParent != null)
+    if (newParent != eInternalContainer()
+        || (eContainerFeatureID() != ArticlePackage.STRUCTURAL_ELEMENT__PARENT && newParent != null))
     {
       if (EcoreUtil.isAncestor(this, newParent))
-      {
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-      }
       NotificationChain msgs = null;
       if (eInternalContainer() != null)
-      {
         msgs = eBasicRemoveFromContainer(msgs);
-      }
       if (newParent != null)
-      {
         msgs = ((InternalEObject)newParent).eInverseAdd(this, ArticlePackage.STRUCTURAL_ELEMENT__CHILDREN,
             StructuralElement.class, msgs);
-      }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
-      {
         msgs.dispatch();
-      }
     }
     else if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.STRUCTURAL_ELEMENT__PARENT, newParent,
           newParent));
-    }
   }
 
   /**
@@ -302,9 +290,7 @@ public abstract class StructuralElementImpl extends LinkTargetImpl implements St
       return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
     case ArticlePackage.STRUCTURAL_ELEMENT__PARENT:
       if (eInternalContainer() != null)
-      {
         msgs = eBasicRemoveFromContainer(msgs);
-      }
       return basicSetParent((StructuralElement)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -444,9 +430,7 @@ public abstract class StructuralElementImpl extends LinkTargetImpl implements St
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (title: ");
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TocImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TocImpl.java
index 6be2f67ade..db6bf47d4b 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TocImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TocImpl.java
@@ -136,9 +136,7 @@ public class TocImpl extends BodyElementImpl implements Toc
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (levels: ");
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleSwitch.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleSwitch.java
index d4cc44b98d..21a6266f3a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleSwitch.java
@@ -38,9 +38,10 @@ import org.eclipse.emf.cdo.releng.doc.article.StructuralElement;
 import org.eclipse.emf.cdo.releng.doc.article.Text;
 import org.eclipse.emf.cdo.releng.doc.article.Toc;
 
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.Switch;
+
+import java.util.List;
 
 /**
  * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
@@ -51,7 +52,7 @@ import org.eclipse.emf.ecore.util.Switch;
  * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage
  * @generated
  */
-public class ArticleSwitch<T> extends Switch<T>
+public class ArticleSwitch<T>
 {
   /**
    * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -74,16 +75,33 @@ public class ArticleSwitch<T> extends Switch<T>
   }
 
   /**
-   * Checks whether this is a switch for the given package. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 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 -->
    * 
-   * @parameter ePackage the package in question.
-   * @return whether this is a switch for the given package.
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
-  @Override
-  protected boolean isSwitchFor(EPackage ePackage)
+  public T doSwitch(EObject theEObject)
   {
-    return ePackage == modelPackage;
+    return doSwitch(theEObject.eClass(), theEObject);
+  }
+
+  /**
+   * 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
+   */
+  protected T doSwitch(EClass theEClass, EObject theEObject)
+  {
+    if (theEClass.eContainer() == modelPackage)
+    {
+      return doSwitch(theEClass.getClassifierID(), theEObject);
+    }
+
+    List<EClass> eSuperTypes = theEClass.getESuperTypes();
+    return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
   }
 
   /**
@@ -93,7 +111,6 @@ public class ArticleSwitch<T> extends Switch<T>
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
-  @Override
   protected T doSwitch(int classifierID, EObject theEObject)
   {
     switch (classifierID)
@@ -103,13 +120,21 @@ public class ArticleSwitch<T> extends Switch<T>
       Documentation documentation = (Documentation)theEObject;
       T result = caseDocumentation(documentation);
       if (result == null)
+      {
         result = caseStructuralElement(documentation);
+      }
       if (result == null)
+      {
         result = caseLinkTarget(documentation);
+      }
       if (result == null)
+      {
         result = caseIdentifiable(documentation);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.CONTEXT:
@@ -117,7 +142,9 @@ public class ArticleSwitch<T> extends Switch<T>
       Context context = (Context)theEObject;
       T result = caseContext(context);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.CATEGORY:
@@ -125,17 +152,29 @@ public class ArticleSwitch<T> extends Switch<T>
       Category category = (Category)theEObject;
       T result = caseCategory(category);
       if (result == null)
+      {
         result = caseBody(category);
+      }
       if (result == null)
+      {
         result = caseStructuralElement(category);
+      }
       if (result == null)
+      {
         result = caseBodyElementContainer(category);
+      }
       if (result == null)
+      {
         result = caseLinkTarget(category);
+      }
       if (result == null)
+      {
         result = caseIdentifiable(category);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.ARTICLE:
@@ -143,19 +182,33 @@ public class ArticleSwitch<T> extends Switch<T>
       Article article = (Article)theEObject;
       T result = caseArticle(article);
       if (result == null)
+      {
         result = caseChapter(article);
+      }
       if (result == null)
+      {
         result = caseBody(article);
+      }
       if (result == null)
+      {
         result = caseStructuralElement(article);
+      }
       if (result == null)
+      {
         result = caseBodyElementContainer(article);
+      }
       if (result == null)
+      {
         result = caseLinkTarget(article);
+      }
       if (result == null)
+      {
         result = caseIdentifiable(article);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.CHAPTER:
@@ -163,17 +216,29 @@ public class ArticleSwitch<T> extends Switch<T>
       Chapter chapter = (Chapter)theEObject;
       T result = caseChapter(chapter);
       if (result == null)
+      {
         result = caseBody(chapter);
+      }
       if (result == null)
+      {
         result = caseStructuralElement(chapter);
+      }
       if (result == null)
+      {
         result = caseBodyElementContainer(chapter);
+      }
       if (result == null)
+      {
         result = caseLinkTarget(chapter);
+      }
       if (result == null)
+      {
         result = caseIdentifiable(chapter);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.SNIPPET:
@@ -181,11 +246,17 @@ public class ArticleSwitch<T> extends Switch<T>
       Snippet snippet = (Snippet)theEObject;
       T result = caseSnippet(snippet);
       if (result == null)
+      {
         result = caseEmbeddableElement(snippet);
+      }
       if (result == null)
+      {
         result = caseIdentifiable(snippet);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.DIAGRAM:
@@ -193,9 +264,13 @@ public class ArticleSwitch<T> extends Switch<T>
       Diagram diagram = (Diagram)theEObject;
       T result = caseDiagram(diagram);
       if (result == null)
+      {
         result = caseBodyElement(diagram);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.FACTORY:
@@ -203,11 +278,17 @@ public class ArticleSwitch<T> extends Switch<T>
       Factory factory = (Factory)theEObject;
       T result = caseFactory(factory);
       if (result == null)
+      {
         result = caseEmbeddableElement(factory);
+      }
       if (result == null)
+      {
         result = caseIdentifiable(factory);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.JAVA_ELEMENT:
@@ -215,11 +296,17 @@ public class ArticleSwitch<T> extends Switch<T>
       JavaElement javaElement = (JavaElement)theEObject;
       T result = caseJavaElement(javaElement);
       if (result == null)
+      {
         result = caseLinkTarget(javaElement);
+      }
       if (result == null)
+      {
         result = caseIdentifiable(javaElement);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.STRUCTURAL_ELEMENT:
@@ -227,11 +314,17 @@ public class ArticleSwitch<T> extends Switch<T>
       StructuralElement structuralElement = (StructuralElement)theEObject;
       T result = caseStructuralElement(structuralElement);
       if (result == null)
+      {
         result = caseLinkTarget(structuralElement);
+      }
       if (result == null)
+      {
         result = caseIdentifiable(structuralElement);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.LINK_TARGET:
@@ -239,9 +332,13 @@ public class ArticleSwitch<T> extends Switch<T>
       LinkTarget linkTarget = (LinkTarget)theEObject;
       T result = caseLinkTarget(linkTarget);
       if (result == null)
+      {
         result = caseIdentifiable(linkTarget);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.CALLOUT:
@@ -249,9 +346,13 @@ public class ArticleSwitch<T> extends Switch<T>
       Callout callout = (Callout)theEObject;
       T result = caseCallout(callout);
       if (result == null)
+      {
         result = caseBodyElementContainer(callout);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.EMBEDDABLE_ELEMENT:
@@ -259,9 +360,13 @@ public class ArticleSwitch<T> extends Switch<T>
       EmbeddableElement embeddableElement = (EmbeddableElement)theEObject;
       T result = caseEmbeddableElement(embeddableElement);
       if (result == null)
+      {
         result = caseIdentifiable(embeddableElement);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.EXTERNAL_TARGET:
@@ -269,11 +374,17 @@ public class ArticleSwitch<T> extends Switch<T>
       ExternalTarget externalTarget = (ExternalTarget)theEObject;
       T result = caseExternalTarget(externalTarget);
       if (result == null)
+      {
         result = caseLinkTarget(externalTarget);
+      }
       if (result == null)
+      {
         result = caseIdentifiable(externalTarget);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.IDENTIFIABLE:
@@ -281,7 +392,9 @@ public class ArticleSwitch<T> extends Switch<T>
       Identifiable identifiable = (Identifiable)theEObject;
       T result = caseIdentifiable(identifiable);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.BODY:
@@ -289,15 +402,25 @@ public class ArticleSwitch<T> extends Switch<T>
       Body body = (Body)theEObject;
       T result = caseBody(body);
       if (result == null)
+      {
         result = caseStructuralElement(body);
+      }
       if (result == null)
+      {
         result = caseBodyElementContainer(body);
+      }
       if (result == null)
+      {
         result = caseLinkTarget(body);
+      }
       if (result == null)
+      {
         result = caseIdentifiable(body);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.BODY_ELEMENT_CONTAINER:
@@ -305,7 +428,9 @@ public class ArticleSwitch<T> extends Switch<T>
       BodyElementContainer bodyElementContainer = (BodyElementContainer)theEObject;
       T result = caseBodyElementContainer(bodyElementContainer);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.BODY_ELEMENT:
@@ -313,7 +438,9 @@ public class ArticleSwitch<T> extends Switch<T>
       BodyElement bodyElement = (BodyElement)theEObject;
       T result = caseBodyElement(bodyElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.TEXT:
@@ -321,9 +448,13 @@ public class ArticleSwitch<T> extends Switch<T>
       Text text = (Text)theEObject;
       T result = caseText(text);
       if (result == null)
+      {
         result = caseBodyElement(text);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.LINK:
@@ -331,9 +462,13 @@ public class ArticleSwitch<T> extends Switch<T>
       Link link = (Link)theEObject;
       T result = caseLink(link);
       if (result == null)
+      {
         result = caseBodyElement(link);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.EMBEDDING:
@@ -341,9 +476,13 @@ public class ArticleSwitch<T> extends Switch<T>
       Embedding embedding = (Embedding)theEObject;
       T result = caseEmbedding(embedding);
       if (result == null)
+      {
         result = caseBodyElement(embedding);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.SOURCE_CODE:
@@ -351,13 +490,21 @@ public class ArticleSwitch<T> extends Switch<T>
       SourceCode sourceCode = (SourceCode)theEObject;
       T result = caseSourceCode(sourceCode);
       if (result == null)
+      {
         result = caseExternalTarget(sourceCode);
+      }
       if (result == null)
+      {
         result = caseLinkTarget(sourceCode);
+      }
       if (result == null)
+      {
         result = caseIdentifiable(sourceCode);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.PLUGIN:
@@ -365,7 +512,9 @@ public class ArticleSwitch<T> extends Switch<T>
       Plugin plugin = (Plugin)theEObject;
       T result = casePlugin(plugin);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.JAVA_PACKAGE:
@@ -373,7 +522,9 @@ public class ArticleSwitch<T> extends Switch<T>
       JavaPackage javaPackage = (JavaPackage)theEObject;
       T result = caseJavaPackage(javaPackage);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.JAVADOC:
@@ -381,19 +532,33 @@ public class ArticleSwitch<T> extends Switch<T>
       Javadoc javadoc = (Javadoc)theEObject;
       T result = caseJavadoc(javadoc);
       if (result == null)
+      {
         result = caseCategory(javadoc);
+      }
       if (result == null)
+      {
         result = caseBody(javadoc);
+      }
       if (result == null)
+      {
         result = caseStructuralElement(javadoc);
+      }
       if (result == null)
+      {
         result = caseBodyElementContainer(javadoc);
+      }
       if (result == null)
+      {
         result = caseLinkTarget(javadoc);
+      }
       if (result == null)
+      {
         result = caseIdentifiable(javadoc);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.EXTERNAL_ARTICLE:
@@ -401,21 +566,37 @@ public class ArticleSwitch<T> extends Switch<T>
       ExternalArticle externalArticle = (ExternalArticle)theEObject;
       T result = caseExternalArticle(externalArticle);
       if (result == null)
+      {
         result = caseArticle(externalArticle);
+      }
       if (result == null)
+      {
         result = caseChapter(externalArticle);
+      }
       if (result == null)
+      {
         result = caseBody(externalArticle);
+      }
       if (result == null)
+      {
         result = caseStructuralElement(externalArticle);
+      }
       if (result == null)
+      {
         result = caseBodyElementContainer(externalArticle);
+      }
       if (result == null)
+      {
         result = caseLinkTarget(externalArticle);
+      }
       if (result == null)
+      {
         result = caseIdentifiable(externalArticle);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.SCHEMADOC:
@@ -423,19 +604,33 @@ public class ArticleSwitch<T> extends Switch<T>
       Schemadoc schemadoc = (Schemadoc)theEObject;
       T result = caseSchemadoc(schemadoc);
       if (result == null)
+      {
         result = caseCategory(schemadoc);
+      }
       if (result == null)
+      {
         result = caseBody(schemadoc);
+      }
       if (result == null)
+      {
         result = caseStructuralElement(schemadoc);
+      }
       if (result == null)
+      {
         result = caseBodyElementContainer(schemadoc);
+      }
       if (result == null)
+      {
         result = caseLinkTarget(schemadoc);
+      }
       if (result == null)
+      {
         result = caseIdentifiable(schemadoc);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.EXTENSION_POINT:
@@ -443,7 +638,9 @@ public class ArticleSwitch<T> extends Switch<T>
       ExtensionPoint extensionPoint = (ExtensionPoint)theEObject;
       T result = caseExtensionPoint(extensionPoint);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.TOC:
@@ -451,9 +648,13 @@ public class ArticleSwitch<T> extends Switch<T>
       Toc toc = (Toc)theEObject;
       T result = caseToc(toc);
       if (result == null)
+      {
         result = caseBodyElement(toc);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case ArticlePackage.PLUGIN_RESOURCE:
@@ -461,23 +662,41 @@ public class ArticleSwitch<T> extends Switch<T>
       PluginResource pluginResource = (PluginResource)theEObject;
       T result = casePluginResource(pluginResource);
       if (result == null)
+      {
         result = caseExternalArticle(pluginResource);
+      }
       if (result == null)
+      {
         result = caseArticle(pluginResource);
+      }
       if (result == null)
+      {
         result = caseChapter(pluginResource);
+      }
       if (result == null)
+      {
         result = caseBody(pluginResource);
+      }
       if (result == null)
+      {
         result = caseStructuralElement(pluginResource);
+      }
       if (result == null)
+      {
         result = caseBodyElementContainer(pluginResource);
+      }
       if (result == null)
+      {
         result = caseLinkTarget(pluginResource);
+      }
       if (result == null)
+      {
         result = caseIdentifiable(pluginResource);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
@@ -947,7 +1166,6 @@ public class ArticleSwitch<T> extends Switch<T>
    * @see #doSwitch(org.eclipse.emf.ecore.EObject)
    * @generated
    */
-  @Override
   public T defaultCase(EObject object)
   {
     return null;
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/model/org.eclipse.emf.cdo.ui.defs.genmodel b/plugins/org.eclipse.emf.cdo.ui.defs/model/org.eclipse.emf.cdo.ui.defs.genmodel
index 25a149cbe3..eb399cd47c 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/model/org.eclipse.emf.cdo.ui.defs.genmodel
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/model/org.eclipse.emf.cdo.ui.defs.genmodel
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&#xA; * All rights reserved. This program and the accompanying materials&#xA; * are made available under the terms of the Eclipse Public License v1.0&#xA; * which accompanies this distribution, and is available at&#xA; * http://www.eclipse.org/legal/epl-v10.html&#xA; * &#xA; * Contributors:&#xA; *    Andre Dietisheim - initial API and implementation&#xA;"
-    modelDirectory="/org.eclipse.emf.cdo.ui.defs/src" editDirectory="" editorDirectory=""
-    modelPluginID="org.eclipse.emf.cdo.ui.defs" modelName="Org.eclipse.emf.cdo.ui"
-    codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.genmodel#//defs ../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel#//defs ../../org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.genmodel#//defs">
-  <foreignModel>org.eclipse.emf.cdo.ui.defs.ecore</foreignModel>
-  <genPackages prefix="CDOUIDefs" basePackage="org.eclipse.emf.cdo.ui" disposableProviderFactory="true"
-      ecorePackage="org.eclipse.emf.cdo.ui.defs.ecore#/">
-    <genClasses ecoreClass="org.eclipse.emf.cdo.ui.defs.ecore#//EditorDef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.emf.cdo.ui.defs.ecore#//EditorDef/editorID"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.emf.cdo.ui.defs.ecore#//CDOEditorDef">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.emf.cdo.ui.defs.ecore#//CDOEditorDef/cdoView"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.emf.cdo.ui.defs.ecore#//CDOEditorDef/resourcePath"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&#xA; * All rights reserved. This program and the accompanying materials&#xA; * are made available under the terms of the Eclipse Public License v1.0&#xA; * which accompanies this distribution, and is available at&#xA; * http://www.eclipse.org/legal/epl-v10.html&#xA; * &#xA; * Contributors:&#xA; *    Andre Dietisheim - initial API and implementation&#xA;"
+    modelDirectory="/org.eclipse.emf.cdo.ui.defs/src" editDirectory="" editorDirectory=""
+    modelPluginID="org.eclipse.emf.cdo.ui.defs" modelName="Org.eclipse.emf.cdo.ui"
+    codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
+    complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.6" usedGenPackages="../../org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.genmodel#//defs ../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel#//defs ../../org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.genmodel#//defs">
+  <foreignModel>org.eclipse.emf.cdo.ui.defs.ecore</foreignModel>
+  <genPackages prefix="CDOUIDefs" basePackage="org.eclipse.emf.cdo.ui" disposableProviderFactory="true"
+      ecorePackage="org.eclipse.emf.cdo.ui.defs.ecore#/">
+    <genClasses ecoreClass="org.eclipse.emf.cdo.ui.defs.ecore#//EditorDef">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.emf.cdo.ui.defs.ecore#//EditorDef/editorID"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.emf.cdo.ui.defs.ecore#//CDOEditorDef">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.emf.cdo.ui.defs.ecore#//CDOEditorDef/cdoView"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.emf.cdo.ui.defs.ecore#//CDOEditorDef/resourcePath"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOEditorDef.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOEditorDef.java
index 714b0e006f..c3e09f28f3 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOEditorDef.java
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOEditorDef.java
@@ -15,14 +15,15 @@ import org.eclipse.emf.cdo.defs.CDOViewDef;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Editor Def</b></em>'. <!-- end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.ui.defs.CDOEditorDef#getCdoView <em>Cdo View</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.ui.defs.CDOEditorDef#getResourcePath <em>Resource Path</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.ui.defs.CDOEditorDef#getCdoView <em>Cdo View</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.ui.defs.CDOEditorDef#getResourcePath <em>Resource Path</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.ui.defs.CDOUIDefsPackage#getCDOEditorDef()
  * @model
  * @generated
@@ -30,13 +31,13 @@ import org.eclipse.emf.cdo.defs.CDOViewDef;
 public interface CDOEditorDef extends EditorDef
 {
   /**
-   * Returns the value of the '<em><b>Cdo View</b></em>' reference. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Cdo View</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Cdo View</em>' reference isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Cdo View</em>' reference.
    * @see #setCdoView(CDOViewDef)
    * @see org.eclipse.emf.cdo.ui.defs.CDOUIDefsPackage#getCDOEditorDef_CdoView()
@@ -48,22 +49,20 @@ public interface CDOEditorDef extends EditorDef
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.ui.defs.CDOEditorDef#getCdoView <em>Cdo View</em>}' reference.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Cdo View</em>' reference.
+   * @param value the new value of the '<em>Cdo View</em>' reference.
    * @see #getCdoView()
    * @generated
    */
   void setCdoView(CDOViewDef value);
 
   /**
-   * Returns the value of the '<em><b>Resource Path</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Resource Path</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Resource Path</em>' attribute isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Resource Path</em>' attribute.
    * @see #setResourcePath(String)
    * @see org.eclipse.emf.cdo.ui.defs.CDOUIDefsPackage#getCDOEditorDef_ResourcePath()
@@ -73,11 +72,9 @@ public interface CDOEditorDef extends EditorDef
   String getResourcePath();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.ui.defs.CDOEditorDef#getResourcePath <em>Resource Path</em>}'
-   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Resource Path</em>' attribute.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.ui.defs.CDOEditorDef#getResourcePath <em>Resource Path</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>Resource Path</em>' attribute.
    * @see #getResourcePath()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOUIDefsFactory.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOUIDefsFactory.java
index 27380e2180..7ea4e4d97a 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOUIDefsFactory.java
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOUIDefsFactory.java
@@ -16,38 +16,37 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
  * the model. <!-- end-user-doc -->
- * 
  * @see org.eclipse.emf.cdo.ui.defs.CDOUIDefsPackage
  * @generated
  */
 public interface CDOUIDefsFactory extends EFactory
 {
   /**
-   * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The singleton instance of the factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   CDOUIDefsFactory eINSTANCE = org.eclipse.emf.cdo.ui.defs.impl.CDOUIDefsFactoryImpl.init();
 
   /**
-   * Returns a new object of class '<em>Editor Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Editor Def</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Editor Def</em>'.
    * @generated
    */
   EditorDef createEditorDef();
 
   /**
-   * Returns a new object of class '<em>CDO Editor Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>CDO Editor Def</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>CDO Editor Def</em>'.
    * @generated
    */
   CDOEditorDef createCDOEditorDef();
 
   /**
-   * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the package supported by this factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the package supported by this factory.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOUIDefsPackage.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOUIDefsPackage.java
index 79cdac39fa..550ba3fded 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOUIDefsPackage.java
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOUIDefsPackage.java
@@ -27,7 +27,6 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * 
  * @see org.eclipse.emf.cdo.ui.defs.CDOUIDefsFactory
  * @model kind="package"
  * @generated
@@ -35,29 +34,29 @@ import org.eclipse.emf.ecore.EReference;
 public interface CDOUIDefsPackage extends EPackage
 {
   /**
-   * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The package name.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   String eNAME = "defs";
 
   /**
-   * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The package namespace URI.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   String eNS_URI = "http://www.eclipse.org/emf/CDO/ui/defs/1.0.0";
 
   /**
-   * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The package namespace name.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   String eNS_PREFIX = "cdo.ui.defs";
 
   /**
-   * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The singleton instance of the package.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   CDOUIDefsPackage eINSTANCE = org.eclipse.emf.cdo.ui.defs.impl.CDOUIDefsPackageImpl.init();
@@ -73,25 +72,24 @@ public interface CDOUIDefsPackage extends EPackage
   int EDITOR_DEF = 0;
 
   /**
-   * The feature id for the '<em><b>Editor ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Editor ID</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int EDITOR_DEF__EDITOR_ID = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
 
   /**
-   * The number of structural features of the '<em>Editor Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The number of structural features of the '<em>Editor Def</em>' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int EDITOR_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.ui.defs.impl.CDOEditorDefImpl <em>CDO Editor Def</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.ui.defs.impl.CDOEditorDefImpl <em>CDO Editor Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.ui.defs.impl.CDOEditorDefImpl
    * @see org.eclipse.emf.cdo.ui.defs.impl.CDOUIDefsPackageImpl#getCDOEditorDef()
    * @generated
@@ -99,24 +97,24 @@ public interface CDOUIDefsPackage extends EPackage
   int CDO_EDITOR_DEF = 1;
 
   /**
-   * The feature id for the '<em><b>Editor ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Editor ID</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int CDO_EDITOR_DEF__EDITOR_ID = EDITOR_DEF__EDITOR_ID;
 
   /**
-   * The feature id for the '<em><b>Cdo View</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Cdo View</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int CDO_EDITOR_DEF__CDO_VIEW = EDITOR_DEF_FEATURE_COUNT + 0;
 
   /**
-   * The feature id for the '<em><b>Resource Path</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Resource Path</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -142,9 +140,8 @@ public interface CDOUIDefsPackage extends EPackage
   EClass getEditorDef();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.ui.defs.EditorDef#getEditorID
-   * <em>Editor ID</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.ui.defs.EditorDef#getEditorID <em>Editor ID</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Editor ID</em>'.
    * @see org.eclipse.emf.cdo.ui.defs.EditorDef#getEditorID()
    * @see #getEditorDef()
@@ -163,9 +160,8 @@ public interface CDOUIDefsPackage extends EPackage
   EClass getCDOEditorDef();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.ui.defs.CDOEditorDef#getCdoView
-   * <em>Cdo View</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.ui.defs.CDOEditorDef#getCdoView <em>Cdo View</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the reference '<em>Cdo View</em>'.
    * @see org.eclipse.emf.cdo.ui.defs.CDOEditorDef#getCdoView()
    * @see #getCDOEditorDef()
@@ -174,9 +170,8 @@ public interface CDOUIDefsPackage extends EPackage
   EReference getCDOEditorDef_CdoView();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.ui.defs.CDOEditorDef#getResourcePath
-   * <em>Resource Path</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.ui.defs.CDOEditorDef#getResourcePath <em>Resource Path</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Resource Path</em>'.
    * @see org.eclipse.emf.cdo.ui.defs.CDOEditorDef#getResourcePath()
    * @see #getCDOEditorDef()
@@ -185,8 +180,8 @@ public interface CDOUIDefsPackage extends EPackage
   EAttribute getCDOEditorDef_ResourcePath();
 
   /**
-   * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the factory that creates the instances of the model.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the factory that creates the instances of the model.
    * @generated
    */
@@ -201,15 +196,13 @@ public interface CDOUIDefsPackage extends EPackage
    * <li>and each data type</li>
    * </ul>
    * <!-- end-user-doc -->
-   * 
    * @generated
    */
   interface Literals
   {
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.ui.defs.impl.EditorDefImpl <em>Editor Def</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.ui.defs.impl.EditorDefImpl <em>Editor Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.emf.cdo.ui.defs.impl.EditorDefImpl
      * @see org.eclipse.emf.cdo.ui.defs.impl.CDOUIDefsPackageImpl#getEditorDef()
      * @generated
@@ -217,17 +210,16 @@ public interface CDOUIDefsPackage extends EPackage
     EClass EDITOR_DEF = eINSTANCE.getEditorDef();
 
     /**
-     * The meta object literal for the '<em><b>Editor ID</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Editor ID</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute EDITOR_DEF__EDITOR_ID = eINSTANCE.getEditorDef_EditorID();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.ui.defs.impl.CDOEditorDefImpl
-     * <em>CDO Editor Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.ui.defs.impl.CDOEditorDefImpl <em>CDO Editor Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.emf.cdo.ui.defs.impl.CDOEditorDefImpl
      * @see org.eclipse.emf.cdo.ui.defs.impl.CDOUIDefsPackageImpl#getCDOEditorDef()
      * @generated
@@ -235,17 +227,17 @@ public interface CDOUIDefsPackage extends EPackage
     EClass CDO_EDITOR_DEF = eINSTANCE.getCDOEditorDef();
 
     /**
-     * The meta object literal for the '<em><b>Cdo View</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Cdo View</b></em>' reference feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EReference CDO_EDITOR_DEF__CDO_VIEW = eINSTANCE.getCDOEditorDef_CdoView();
 
     /**
-     * The meta object literal for the '<em><b>Resource Path</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Resource Path</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute CDO_EDITOR_DEF__RESOURCE_PATH = eINSTANCE.getCDOEditorDef_ResourcePath();
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/EditorDef.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/EditorDef.java
index 4bae1f0ff1..38e20e7350 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/EditorDef.java
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/EditorDef.java
@@ -15,13 +15,14 @@ import org.eclipse.net4j.util.defs.Def;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Editor Def</b></em>'. <!-- end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.ui.defs.EditorDef#getEditorID <em>Editor ID</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.ui.defs.EditorDef#getEditorID <em>Editor ID</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.ui.defs.CDOUIDefsPackage#getEditorDef()
  * @model
  * @generated
@@ -29,13 +30,13 @@ import org.eclipse.net4j.util.defs.Def;
 public interface EditorDef extends Def
 {
   /**
-   * Returns the value of the '<em><b>Editor ID</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Editor ID</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Editor ID</em>' attribute isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Editor ID</em>' attribute.
    * @see #setEditorID(String)
    * @see org.eclipse.emf.cdo.ui.defs.CDOUIDefsPackage#getEditorDef_EditorID()
@@ -47,9 +48,7 @@ public interface EditorDef extends Def
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.ui.defs.EditorDef#getEditorID <em>Editor ID</em>}' attribute.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Editor ID</em>' attribute.
+   * @param value the new value of the '<em>Editor ID</em>' attribute.
    * @see #getEditorID()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOEditorDefImpl.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOEditorDefImpl.java
index 1f723301dd..d4e6878eda 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOEditorDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOEditorDefImpl.java
@@ -54,9 +54,9 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
 {
 
   /**
-   * The cached value of the '{@link #getCdoView() <em>Cdo View</em>}' reference. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getCdoView() <em>Cdo View</em>}' reference.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getCdoView()
    * @generated
    * @ordered
@@ -64,9 +64,9 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
   protected CDOViewDef cdoView;
 
   /**
-   * The default value of the '{@link #getResourcePath() <em>Resource Path</em>}' attribute. <!-- begin-user-doc -->
+   * The default value of the '{@link #getResourcePath() <em>Resource Path</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @see #getResourcePath()
    * @generated
    * @ordered
@@ -74,9 +74,9 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
   protected static final String RESOURCE_PATH_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getResourcePath() <em>Resource Path</em>}' attribute. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getResourcePath() <em>Resource Path</em>}' attribute.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getResourcePath()
    * @generated
    * @ordered
@@ -152,7 +152,6 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected CDOEditorDefImpl()
@@ -162,7 +161,6 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -173,7 +171,6 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOViewDef getCdoView()
@@ -185,10 +182,8 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
       if (cdoView != oldCdoView)
       {
         if (eNotificationRequired())
-        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDOUIDefsPackage.CDO_EDITOR_DEF__CDO_VIEW,
               oldCdoView, cdoView));
-        }
       }
     }
     return cdoView;
@@ -196,7 +191,6 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOViewDef basicGetCdoView()
@@ -206,7 +200,6 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setCdoView(CDOViewDef newCdoView)
@@ -214,15 +207,12 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
     CDOViewDef oldCdoView = cdoView;
     cdoView = newCdoView;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDOUIDefsPackage.CDO_EDITOR_DEF__CDO_VIEW, oldCdoView,
           cdoView));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getResourcePath()
@@ -232,7 +222,6 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setResourcePath(String newResourcePath)
@@ -240,15 +229,12 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
     String oldResourcePath = resourcePath;
     resourcePath = newResourcePath;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDOUIDefsPackage.CDO_EDITOR_DEF__RESOURCE_PATH,
           oldResourcePath, resourcePath));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -258,9 +244,7 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
     {
     case CDOUIDefsPackage.CDO_EDITOR_DEF__CDO_VIEW:
       if (resolve)
-      {
         return getCdoView();
-      }
       return basicGetCdoView();
     case CDOUIDefsPackage.CDO_EDITOR_DEF__RESOURCE_PATH:
       return getResourcePath();
@@ -270,7 +254,6 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -290,7 +273,6 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -310,7 +292,6 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -328,16 +309,13 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (resourcePath: ");
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOUIDefsFactoryImpl.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOUIDefsFactoryImpl.java
index d46964a96c..4f041d7639 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOUIDefsFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOUIDefsFactoryImpl.java
@@ -25,14 +25,13 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- * 
  * @generated
  */
 public class CDOUIDefsFactoryImpl extends EFactoryImpl implements CDOUIDefsFactory
 {
   /**
-   * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates the default factory implementation.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public static CDOUIDefsFactory init()
@@ -54,8 +53,8 @@ public class CDOUIDefsFactoryImpl extends EFactoryImpl implements CDOUIDefsFacto
   }
 
   /**
-   * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates an instance of the factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public CDOUIDefsFactoryImpl()
@@ -65,7 +64,6 @@ public class CDOUIDefsFactoryImpl extends EFactoryImpl implements CDOUIDefsFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -84,7 +82,6 @@ public class CDOUIDefsFactoryImpl extends EFactoryImpl implements CDOUIDefsFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EditorDef createEditorDef()
@@ -95,7 +92,6 @@ public class CDOUIDefsFactoryImpl extends EFactoryImpl implements CDOUIDefsFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOEditorDef createCDOEditorDef()
@@ -106,7 +102,6 @@ public class CDOUIDefsFactoryImpl extends EFactoryImpl implements CDOUIDefsFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOUIDefsPackage getCDOUIDefsPackage()
@@ -116,7 +111,6 @@ public class CDOUIDefsFactoryImpl extends EFactoryImpl implements CDOUIDefsFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOUIDefsPackageImpl.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOUIDefsPackageImpl.java
index 9fe1de6d78..0962b78dad 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOUIDefsPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOUIDefsPackageImpl.java
@@ -27,21 +27,18 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- * 
  * @generated
  */
 public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPackage
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass editorDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass cdoEditorDefEClass = null;
@@ -66,18 +63,17 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private static boolean isInited = false;
 
   /**
    * 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 CDOUIDefsPackage#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
-   * --> <!-- end-user-doc -->
    * 
+   * <p>This method is used to initialize {@link CDOUIDefsPackage#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
+   * --> <!-- end-user-doc -->
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -86,9 +82,7 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
   public static CDOUIDefsPackage init()
   {
     if (isInited)
-    {
       return (CDOUIDefsPackage)EPackage.Registry.INSTANCE.getEPackage(CDOUIDefsPackage.eNS_URI);
-    }
 
     // Obtain or create and register package
     CDOUIDefsPackageImpl theCDOUIDefsPackage = (CDOUIDefsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CDOUIDefsPackageImpl ? EPackage.Registry.INSTANCE
@@ -115,7 +109,6 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getEditorDef()
@@ -125,7 +118,6 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getEditorDef_EditorID()
@@ -135,7 +127,6 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getCDOEditorDef()
@@ -145,7 +136,6 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getCDOEditorDef_CdoView()
@@ -155,7 +145,6 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getCDOEditorDef_ResourcePath()
@@ -165,7 +154,6 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOUIDefsFactory getCDOUIDefsFactory()
@@ -175,23 +163,20 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private boolean isCreated = false;
 
   /**
-   * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
-   * first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates the meta-model objects for the package.  This method is
+   * guarded to have no affect on any invocation but its first.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public void createPackageContents()
   {
     if (isCreated)
-    {
       return;
-    }
     isCreated = true;
 
     // Create classes and their features
@@ -205,23 +190,20 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private boolean isInitialized = false;
 
   /**
-   * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
-   * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Complete the initialization of the package and its meta-model.  This
+   * method is guarded to have no affect on any invocation but its first.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public void initializePackageContents()
   {
     if (isInitialized)
-    {
       return;
-    }
     isInitialized = true;
 
     // Initialize package
@@ -240,7 +222,7 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
 
     // Add supertypes to classes
     editorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    cdoEditorDefEClass.getESuperTypes().add(getEditorDef());
+    cdoEditorDefEClass.getESuperTypes().add(this.getEditorDef());
 
     // Initialize classes and features; add operations and parameters
     initEClass(editorDefEClass, EditorDef.class, "EditorDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/EditorDefImpl.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/EditorDefImpl.java
index 560ad8382e..0eaefdafb1 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/EditorDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/EditorDefImpl.java
@@ -26,18 +26,18 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.ui.defs.impl.EditorDefImpl#getEditorID <em>Editor ID</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.ui.defs.impl.EditorDefImpl#getEditorID <em>Editor ID</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class EditorDefImpl extends DefImpl implements EditorDef
 {
   /**
-   * The default value of the '{@link #getEditorID() <em>Editor ID</em>}' attribute. <!-- begin-user-doc --> <!--
+   * The default value of the '{@link #getEditorID() <em>Editor ID</em>}' attribute.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getEditorID()
    * @generated
    * @ordered
@@ -45,9 +45,9 @@ public class EditorDefImpl extends DefImpl implements EditorDef
   protected static final String EDITOR_ID_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getEditorID() <em>Editor ID</em>}' attribute. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getEditorID() <em>Editor ID</em>}' attribute.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getEditorID()
    * @generated
    * @ordered
@@ -56,7 +56,6 @@ public class EditorDefImpl extends DefImpl implements EditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected EditorDefImpl()
@@ -66,7 +65,6 @@ public class EditorDefImpl extends DefImpl implements EditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -77,7 +75,6 @@ public class EditorDefImpl extends DefImpl implements EditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getEditorID()
@@ -87,7 +84,6 @@ public class EditorDefImpl extends DefImpl implements EditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setEditorID(String newEditorID)
@@ -95,15 +91,12 @@ public class EditorDefImpl extends DefImpl implements EditorDef
     String oldEditorID = editorID;
     editorID = newEditorID;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDOUIDefsPackage.EDITOR_DEF__EDITOR_ID, oldEditorID,
           editorID));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -119,7 +112,6 @@ public class EditorDefImpl extends DefImpl implements EditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -136,7 +128,6 @@ public class EditorDefImpl extends DefImpl implements EditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -153,7 +144,6 @@ public class EditorDefImpl extends DefImpl implements EditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -169,16 +159,13 @@ public class EditorDefImpl extends DefImpl implements EditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (editorID: ");
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/util/CDOUIDefsAdapterFactory.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/util/CDOUIDefsAdapterFactory.java
index 1013f0d790..bba85402fa 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/util/CDOUIDefsAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/util/CDOUIDefsAdapterFactory.java
@@ -26,22 +26,21 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
  * method for each class of the model. <!-- end-user-doc -->
- * 
  * @see org.eclipse.emf.cdo.ui.defs.CDOUIDefsPackage
  * @generated
  */
 public class CDOUIDefsAdapterFactory extends AdapterFactoryImpl
 {
   /**
-   * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The cached model package.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected static CDOUIDefsPackage modelPackage;
 
   /**
-   * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates an instance of the adapter factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public CDOUIDefsAdapterFactory()
@@ -53,10 +52,10 @@ public class CDOUIDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
+   * Returns whether this factory is applicable for the type of the object.
+   * <!-- begin-user-doc --> This implementation
    * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
    * end-user-doc -->
-   * 
    * @return whether this factory is applicable for the type of the object.
    * @generated
    */
@@ -75,8 +74,8 @@ public class CDOUIDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The switch that delegates to the <code>createXXX</code> methods.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected CDOUIDefsSwitch<Adapter> modelSwitch = new CDOUIDefsSwitch<Adapter>()
@@ -107,10 +106,9 @@ public class CDOUIDefsAdapterFactory extends AdapterFactoryImpl
   };
 
   /**
-   * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param target
-   *          the object to adapt.
+   * Creates an adapter for the <code>target</code>.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param target the object to adapt.
    * @return the adapter for the <code>target</code>.
    * @generated
    */
@@ -124,7 +122,6 @@ public class CDOUIDefsAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.ui.defs.EditorDef <em>Editor 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.emf.cdo.ui.defs.EditorDef
    * @generated
@@ -135,10 +132,9 @@ public class CDOUIDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.ui.defs.CDOEditorDef
-   * <em>CDO Editor Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.ui.defs.CDOEditorDef <em>CDO Editor 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.emf.cdo.ui.defs.CDOEditorDef
    * @generated
@@ -163,9 +159,9 @@ public class CDOUIDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
+   * Creates a new adapter for the default case.
+   * <!-- begin-user-doc --> This default implementation returns null. <!--
    * end-user-doc -->
-   * 
    * @return the new adapter.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/CDOModelFile.gif b/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/CDOModelFile.gif
new file mode 100644
index 0000000000..560f25470f
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui/icons/full/obj16/CDOModelFile.gif
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java
index 5b433f1324..c278e58399 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java
@@ -121,14 +121,14 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
    * @generated
    */
   protected IAction showPropertiesViewAction = new Action(
-      PluginDelegator.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+      PluginDelegator.INSTANCE.getString("_UI_ShowPropertiesView_menu_item"))
   {
     @Override
     public void run()
     {
       try
       {
-        getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+        getPage().showView("org.eclipse.ui.views.PropertySheet");
       }
       catch (PartInitException exception)
       {
@@ -143,7 +143,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
    * 
    * @generated
    */
-  protected IAction refreshViewerAction = new Action(PluginDelegator.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+  protected IAction refreshViewerAction = new Action(PluginDelegator.INSTANCE.getString("_UI_RefreshViewer_menu_item"))
   {
     @Override
     public boolean isEnabled()
@@ -229,8 +229,8 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
   @Override
   public void contributeToToolBar(IToolBarManager toolBarManager)
   {
-    toolBarManager.add(new Separator("cdo-settings")); //$NON-NLS-1$
-    toolBarManager.add(new Separator("cdo-additions")); //$NON-NLS-1$
+    toolBarManager.add(new Separator("cdo-settings"));
+    toolBarManager.add(new Separator("cdo-additions"));
   }
 
   /**
@@ -244,23 +244,23 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
   {
     super.contributeToMenu(menuManager);
 
-    IMenuManager submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CDOEditor_menu"), //$NON-NLS-1$
-        "org.eclipse.emf.cdo.internal.ui.editorMenuID"); //$NON-NLS-1$
-    menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
-    submenuManager.add(new Separator("settings")); //$NON-NLS-1$
-    submenuManager.add(new Separator("actions")); //$NON-NLS-1$
-    submenuManager.add(new Separator("additions")); //$NON-NLS-1$
-    submenuManager.add(new Separator("additions-end")); //$NON-NLS-1$
+    IMenuManager submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CDOEditor_menu"),
+        "org.eclipse.emf.cdo.internal.ui.editorMenuID");
+    menuManager.insertAfter("additions", submenuManager);
+    submenuManager.add(new Separator("settings"));
+    submenuManager.add(new Separator("actions"));
+    submenuManager.add(new Separator("additions"));
+    submenuManager.add(new Separator("additions-end"));
 
     // Prepare for CreateChild item addition or removal.
     //
-    createChildMenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
-    submenuManager.insertBefore("additions", createChildMenuManager); //$NON-NLS-1$
+    createChildMenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateChild_menu_item"));
+    submenuManager.insertBefore("additions", createChildMenuManager);
 
     // Prepare for CreateSibling item addition or removal.
     //
-    createSiblingMenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
-    submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
+    createSiblingMenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+    submenuManager.insertBefore("additions", createSiblingMenuManager);
 
     // Force an update because Eclipse hides empty menus now.
     //
@@ -559,13 +559,13 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
     super.menuAboutToShow(menuManager);
     MenuManager submenuManager = null;
 
-    submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateChild_menu_item")); //$NON-NLS-1$
+    submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateChild_menu_item"));
     populateManager(submenuManager, createChildActions, null);
-    menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+    menuManager.insertBefore("edit", submenuManager);
 
-    submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+    submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CreateSibling_menu_item"));
     populateManager(submenuManager, createSiblingActions, null);
-    menuManager.insertBefore("edit", submenuManager); //$NON-NLS-1$
+    menuManager.insertBefore("edit", submenuManager);
   }
 
   /**
@@ -575,11 +575,11 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
    */
   protected void addGlobalActionsGen(IMenuManager menuManager)
   {
-    menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
-    menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
+    menuManager.insertAfter("additions-end", new Separator("ui-actions"));
+    menuManager.insertAfter("ui-actions", showPropertiesViewAction);
 
     refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
-    menuManager.insertAfter("ui-actions", refreshViewerAction); //$NON-NLS-1$
+    menuManager.insertAfter("ui-actions", refreshViewerAction);
 
     super.addGlobalActions(menuManager);
   }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
index fa93bede93..dffe1cf69d 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
@@ -611,11 +611,17 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
    */
   protected void handleActivateGen()
   {
+    // Recompute the read only state.
+    //
     if (editingDomain.getResourceToReadOnlyMap() != null)
     {
       editingDomain.getResourceToReadOnlyMap().clear();
+
+      // Refresh any actions that may become enabled or disabled.
+      //
       setSelection(getSelection());
     }
+
     if (!removedResources.isEmpty())
     {
       if (handleDirtyConflict())
@@ -704,7 +710,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
   {
     if (updateProblemIndication)
     {
-      BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, "org.eclipse.emf.cdo.ui", 0, null, //$NON-NLS-1$
+      BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, "org.eclipse.emf.cdo.ui", 0, null,
           new Object[] { editingDomain.getResourceSet() });
       for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values())
       {
@@ -766,8 +772,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
    */
   protected boolean handleDirtyConflict()
   {
-    return MessageDialog.openQuestion(getSite().getShell(), getString("_UI_FileConflict_label"), //$NON-NLS-1$
-        getString("_WARN_FileConflict")); //$NON-NLS-1$
+    return MessageDialog.openQuestion(getSite().getShell(), getString("_UI_FileConflict_label"),
+        getString("_WARN_FileConflict"));
   }
 
   /**
@@ -1029,8 +1035,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
    */
   protected void createContextMenuFor(StructuredViewer viewer)
   {
-    MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
-    contextMenu.add(new Separator("additions")); //$NON-NLS-1$
+    MenuManager contextMenu = new MenuManager("#PopUp");
+    contextMenu.add(new Separator("additions"));
     contextMenu.setRemoveAllWhenShown(true);
     contextMenu.addMenuListener(this);
     Menu menu = contextMenu.createContextMenu(viewer.getControl());
@@ -1164,16 +1170,16 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
   {
     if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())
     {
-      BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.ui", 0, getString( //$NON-NLS-1$
-          "_UI_CreateModelError_message", resource.getURI()), new Object[] { exception == null ? (Object)resource //$NON-NLS-1$
+      BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.ui", 0, getString(
+          "_UI_CreateModelError_message", resource.getURI()), new Object[] { exception == null ? (Object)resource
           : exception });
       basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
       return basicDiagnostic;
     }
     else if (exception != null)
     {
-      return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.ui", 0, getString( //$NON-NLS-1$
-          "_UI_CreateModelError_message", resource.getURI()), new Object[] { exception }); //$NON-NLS-1$
+      return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.ui", 0, getString(
+          "_UI_CreateModelError_message", resource.getURI()), new Object[] { exception });
     }
     else
     {
@@ -1212,7 +1218,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
 
       createContextMenuFor(selectionViewer);
       int pageIndex = addPage(tree);
-      setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
+      setPageText(pageIndex, getString("_UI_SelectionPage_label"));
 
       getSite().getShell().getDisplay().asyncExec(new Runnable()
       {
@@ -2171,25 +2177,25 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
         {
         case 0:
         {
-          statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$
+          statusLineManager.setMessage(getString("_UI_NoObjectSelected"));
           break;
         }
         case 1:
         {
           String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
-          statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$
+          statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));
           break;
         }
         default:
         {
-          statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$
+          statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));
           break;
         }
         }
       }
       else
       {
-        statusLineManager.setMessage(""); //$NON-NLS-1$
+        statusLineManager.setMessage("");
       }
     }
   }
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/package-info.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/package-info.java
index b544d3dbd9..57aff6649c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/package-info.java
@@ -13,3 +13,4 @@
  * Reusable UI components specific to the CDO Model Repository.
  */
 package org.eclipse.emf.cdo.ui;
+
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/ComposeBranchPointComposite.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/ComposeBranchPointComposite.java
index a5f7f72a62..f243559ecf 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/ComposeBranchPointComposite.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/ComposeBranchPointComposite.java
@@ -106,7 +106,7 @@ public class ComposeBranchPointComposite extends Composite
         {
           selectTimeStampComposite.setBranch(newBranch);
         }
-  
+
         composeBranchPoint();
       }
     };
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/package-info.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/package-info.java
index 1e83df6cf2..8d439ff8b9 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/package-info.java
@@ -13,3 +13,4 @@
  * A library with reusable widgets.
  */
 package org.eclipse.emf.cdo.ui.widgets;
+
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResource.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResource.java
index b92916607f..ed2c80501e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResource.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResource.java
@@ -36,7 +36,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
  *                  <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isModified <em>Modified</em>}</li>
  *                  <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isLoaded <em>Loaded</em>}</li>
  *                  <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification <em>Tracking
- *                  Modification </em>}</li>
+ *                  Modification</em>}</li>
  *                  <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getErrors <em>Errors</em>}</li>
  *                  <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getWarnings <em>Warnings</em>}</li>
  *                  <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getTimeStamp <em>Time Stamp</em>}</li>
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFolder.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFolder.java
index eea48ae2be..41d137611d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFolder.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFolder.java
@@ -19,10 +19,15 @@ import org.eclipse.emf.common.util.EList;
  * @apiviz.composedOf {@link CDOResourceNode} - - nodes
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc -->
+ *              <p>
+ *              The following features are supported:
+ *              <ul>
+ *              <li>{@link org.eclipse.emf.cdo.eresource.CDOResourceFolder#getNodes <em>Nodes</em>}</li>
+ *              </ul>
+ *              </p>
  * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResourceFolder()
  * @model
  * @generated
- * @since 2.0
  */
 public interface CDOResourceFolder extends CDOResourceNode
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceNode.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceNode.java
index 741773a455..7822ccf764 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceNode.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceNode.java
@@ -32,8 +32,8 @@ import java.util.Map;
  *              </p>
  * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResourceNode()
  * @model abstract="true"
+ * @extends CDOObject
  * @generated
- * @since 2.0
  */
 public interface CDOResourceNode extends CDOObject
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java
index 43fbdc6fae..a8fcc099c3 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java
@@ -41,7 +41,6 @@ import java.util.List;
  *           </ul>
  *           </p>
  * @generated
- * @since 2.0
  */
 public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDOResourceNode
 {
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java
index 9fc2d871cc..682915b3b6 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java
@@ -117,9 +117,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
   public static EresourcePackage init()
   {
     if (isInited)
-    {
       return (EresourcePackage)EPackage.Registry.INSTANCE.getEPackage(EresourcePackage.eNS_URI);
-    }
 
     // Obtain or create and register package
     EresourcePackageImpl theEresourcePackage = (EresourcePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EresourcePackageImpl ? EPackage.Registry.INSTANCE
@@ -366,9 +364,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
   public void createPackageContents()
   {
     if (isCreated)
-    {
       return;
-    }
     isCreated = true;
 
     // Create classes and their features
@@ -413,9 +409,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
   public void initializePackageContents()
   {
     if (isInitialized)
-    {
       return;
-    }
     isInitialized = true;
 
     // Initialize package
@@ -431,16 +425,16 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
     // Set bounds for type parameters
 
     // Add supertypes to classes
-    cdoResourceFolderEClass.getESuperTypes().add(getCDOResourceNode());
-    cdoResourceEClass.getESuperTypes().add(getCDOResourceNode());
+    cdoResourceFolderEClass.getESuperTypes().add(this.getCDOResourceNode());
+    cdoResourceEClass.getESuperTypes().add(this.getCDOResourceNode());
 
     // Initialize classes and features; add operations and parameters
     initEClass(cdoResourceNodeEClass, CDOResourceNode.class,
         "CDOResourceNode", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEReference(
         getCDOResourceNode_Folder(),
-        getCDOResourceFolder(),
-        getCDOResourceFolder_Nodes(),
+        this.getCDOResourceFolder(),
+        this.getCDOResourceFolder_Nodes(),
         "folder", null, 0, 1, CDOResourceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEAttribute(
         getCDOResourceNode_Name(),
@@ -455,26 +449,26 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
         "CDOResourceFolder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEReference(
         getCDOResourceFolder_Nodes(),
-        getCDOResourceNode(),
-        getCDOResourceNode_Folder(),
+        this.getCDOResourceNode(),
+        this.getCDOResourceNode_Folder(),
         "nodes", null, 0, -1, CDOResourceFolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    EOperation op = addEOperation(cdoResourceFolderEClass, getCDOResourceFolder(),
+    EOperation op = addEOperation(cdoResourceFolderEClass, this.getCDOResourceFolder(),
         "addResourceFolder", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
     addEParameter(op, theEcorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
-    op = addEOperation(cdoResourceFolderEClass, getCDOResource(), "addResource", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+    op = addEOperation(cdoResourceFolderEClass, this.getCDOResource(), "addResource", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
     addEParameter(op, theEcorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
     initEClass(cdoResourceEClass, CDOResource.class,
         "CDOResource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(
         getCDOResource_ResourceSet(),
-        getResourceSet(),
+        this.getResourceSet(),
         "resourceSet", null, 0, 1, CDOResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEAttribute(
         getCDOResource_URI(),
-        getURI(),
+        this.getURI(),
         "uRI", null, 0, 1, CDOResource.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
         getCDOResource_Contents(),
@@ -495,11 +489,11 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
         "trackingModification", null, 0, 1, CDOResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEAttribute(
         getCDOResource_Errors(),
-        getDiagnostic(),
+        this.getDiagnostic(),
         "errors", null, 0, -1, CDOResource.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEAttribute(
         getCDOResource_Warnings(),
-        getDiagnostic(),
+        this.getDiagnostic(),
         "warnings", null, 0, -1, CDOResource.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEAttribute(
         getCDOResource_TimeStamp(),
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/package-info.java
index 34d57e8d0f..aaee7cb604 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/package-info.java
@@ -13,3 +13,4 @@
  * The generated EMF utilities of the CDO repository file system.
  */
 package org.eclipse.emf.cdo.eresource.util;
+
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesPackage.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesPackage.java
index 996d897388..8224eaa0e7 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesPackage.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesPackage.java
@@ -27,10 +27,6 @@ import org.eclipse.emf.ecore.EReference;
  * </ul>
  * <!-- end-user-doc -->
  * 
- * @since 4.0
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
- * @apiviz.exclude
  * @see org.eclipse.emf.cdo.etypes.EtypesFactory
  * @model kind="package"
  * @generated
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java
index 55f6ed441a..731ac2386f 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java
@@ -103,9 +103,7 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
   public static EtypesPackage init()
   {
     if (isInited)
-    {
       return (EtypesPackage)EPackage.Registry.INSTANCE.getEPackage(EtypesPackage.eNS_URI);
-    }
 
     // Obtain or create and register package
     EtypesPackageImpl theEtypesPackage = (EtypesPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EtypesPackageImpl ? EPackage.Registry.INSTANCE
@@ -256,9 +254,7 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
   public void createPackageContents()
   {
     if (isCreated)
-    {
       return;
-    }
     isCreated = true;
 
     // Create classes and their features
@@ -293,9 +289,7 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
   public void initializePackageContents()
   {
     if (isInitialized)
-    {
       return;
-    }
     isInitialized = true;
 
     // Initialize package
@@ -311,18 +305,19 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
     // Set bounds for type parameters
 
     // Add supertypes to classes
-    annotationEClass.getESuperTypes().add(getModelElement());
+    annotationEClass.getESuperTypes().add(this.getModelElement());
 
     // Initialize classes and features; add operations and parameters
     initEClass(modelElementEClass, ModelElement.class,
         "ModelElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEReference(
         getModelElement_Annotations(),
-        getAnnotation(),
-        getAnnotation_ModelElement(),
+        this.getAnnotation(),
+        this.getAnnotation_ModelElement(),
         "annotations", null, 0, -1, ModelElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    EOperation op = addEOperation(modelElementEClass, getAnnotation(), "getAnnotation", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+    EOperation op = addEOperation(modelElementEClass, this.getAnnotation(),
+        "getAnnotation", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
     addEParameter(op, theEcorePackage.getEString(), "source", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
     initEClass(annotationEClass, Annotation.class,
@@ -338,8 +333,8 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
         "details", null, 0, -1, Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
         getAnnotation_ModelElement(),
-        getModelElement(),
-        getModelElement_Annotations(),
+        this.getModelElement(),
+        this.getModelElement_Annotations(),
         "modelElement", null, 0, 1, Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
         getAnnotation_Contents(),
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/util/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/util/package-info.java
index 3894d54b1b..c987f19132 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/util/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/util/package-info.java
@@ -13,3 +13,4 @@
  * The generated EMF utilities of the CDO system data types and native annotations.
  */
 package org.eclipse.emf.cdo.etypes.util;
+
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/package-info.java
index 834e155447..5f63dc4479 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/remote/package-info.java
@@ -13,3 +13,4 @@
  * Client concepts for the communication and collaboration with other sessions.
  */
 package org.eclipse.emf.cdo.session.remote;
+
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/package-info.java
index 70a1c27d5d..6492adcb5d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/package-info.java
@@ -13,3 +13,4 @@
  * Client utility classes, some common interfaces and exceptions.
  */
 package org.eclipse.emf.cdo.util;
+
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/package-info.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/package-info.java
index f8c8417418..2422f77f28 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/package-info.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/package-info.java
@@ -13,3 +13,4 @@
  * Exposes {@link org.eclipse.emf.internal.cdo.CDOObjectImpl} for extension in generated EMF models.
  */
 package org.eclipse.emf.internal.cdo;
+
diff --git a/plugins/org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.genmodel b/plugins/org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.genmodel
index aed216467a..1eb7b04ec9 100644
--- a/plugins/org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.genmodel
+++ b/plugins/org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.genmodel
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&#xA; * All rights reserved. This program and the accompanying materials&#xA; * are made available under the terms of the Eclipse Public License v1.0&#xA; * which accompanies this distribution, and is available at&#xA; * http://www.eclipse.org/legal/epl-v10.html&#xA; * &#xA; * Contributors:&#xA; *    Andre Dietisheim - initial API and implementation"
-    modelDirectory="/org.eclipse.net4j.defs/src" editDirectory="" editorDirectory=""
-    modelPluginID="org.eclipse.net4j.defs" modelName="Org.eclipse.net4j" codeFormatting="true"
-    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
-    copyrightFields="false" usedGenPackages="../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel#//defs">
-  <foreignModel>org.eclipse.net4j.defs.ecore</foreignModel>
-  <genPackages prefix="Net4jDefs" basePackage="org.eclipse.net4j" disposableProviderFactory="true"
-      ecorePackage="org.eclipse.net4j.defs.ecore#/">
-    <genClasses image="false" ecoreClass="org.eclipse.net4j.defs.ecore#//ConnectorDef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//ConnectorDef/userID"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//ConnectorDef/bufferProvider"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//ConnectorDef/executorService"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//ConnectorDef/negotiator"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//ConnectorDef/clientProtocolProvider"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="org.eclipse.net4j.defs.ecore#//ClientProtocolFactoryDef"/>
-    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//TCPConnectorDef">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//TCPConnectorDef/tcpSelectorDef"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//TCPConnectorDef/host"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//TCPConnectorDef/port"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//AcceptorDef">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//AcceptorDef/bufferProvider"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//AcceptorDef/executorService"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//AcceptorDef/negotiator"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//AcceptorDef/serverProtocolProvider"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//TCPAcceptorDef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//TCPAcceptorDef/host"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//TCPAcceptorDef/port"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//TCPAcceptorDef/tcpSelectorDef"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//JVMAcceptorDef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//JVMAcceptorDef/name"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//JVMConnectorDef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//JVMConnectorDef/name"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//HTTPConnectorDef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//HTTPConnectorDef/url"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//TCPSelectorDef"/>
-    <genClasses image="false" ecoreClass="org.eclipse.net4j.defs.ecore#//ServerProtocolFactoryDef"/>
-    <genClasses image="false" ecoreClass="org.eclipse.net4j.defs.ecore#//BufferProviderDef"/>
-    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//BufferPoolDef"/>
-    <genClasses image="false" ecoreClass="org.eclipse.net4j.defs.ecore#//ProtocolProviderDef"/>
-  </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&#xA; * All rights reserved. This program and the accompanying materials&#xA; * are made available under the terms of the Eclipse Public License v1.0&#xA; * which accompanies this distribution, and is available at&#xA; * http://www.eclipse.org/legal/epl-v10.html&#xA; * &#xA; * Contributors:&#xA; *    Andre Dietisheim - initial API and implementation"
+    modelDirectory="/org.eclipse.net4j.defs/src" editDirectory="" editorDirectory=""
+    modelPluginID="org.eclipse.net4j.defs" modelName="Org.eclipse.net4j" codeFormatting="true"
+    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
+    copyrightFields="false" runtimeVersion="2.6" usedGenPackages="../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel#//defs">
+  <foreignModel>org.eclipse.net4j.defs.ecore</foreignModel>
+  <genPackages prefix="Net4jDefs" basePackage="org.eclipse.net4j" disposableProviderFactory="true"
+      ecorePackage="org.eclipse.net4j.defs.ecore#/">
+    <genClasses image="false" ecoreClass="org.eclipse.net4j.defs.ecore#//ConnectorDef">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//ConnectorDef/userID"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//ConnectorDef/bufferProvider"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//ConnectorDef/executorService"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//ConnectorDef/negotiator"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//ConnectorDef/clientProtocolProvider"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="org.eclipse.net4j.defs.ecore#//ClientProtocolFactoryDef"/>
+    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//TCPConnectorDef">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//TCPConnectorDef/tcpSelectorDef"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//TCPConnectorDef/host"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//TCPConnectorDef/port"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//AcceptorDef">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//AcceptorDef/bufferProvider"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//AcceptorDef/executorService"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//AcceptorDef/negotiator"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//AcceptorDef/serverProtocolProvider"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//TCPAcceptorDef">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//TCPAcceptorDef/host"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//TCPAcceptorDef/port"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.defs.ecore#//TCPAcceptorDef/tcpSelectorDef"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//JVMAcceptorDef">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//JVMAcceptorDef/name"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//JVMConnectorDef">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//JVMConnectorDef/name"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//HTTPConnectorDef">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.defs.ecore#//HTTPConnectorDef/url"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//TCPSelectorDef"/>
+    <genClasses image="false" ecoreClass="org.eclipse.net4j.defs.ecore#//ServerProtocolFactoryDef"/>
+    <genClasses image="false" ecoreClass="org.eclipse.net4j.defs.ecore#//BufferProviderDef"/>
+    <genClasses ecoreClass="org.eclipse.net4j.defs.ecore#//BufferPoolDef"/>
+    <genClasses image="false" ecoreClass="org.eclipse.net4j.defs.ecore#//ProtocolProviderDef"/>
+  </genPackages>
+</genmodel:GenModel>
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 d985a0a4fe..701f7ea938 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
@@ -19,16 +19,17 @@ import org.eclipse.emf.common.util.EList;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Acceptor Def</b></em>'. <!-- end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.net4j.defs.AcceptorDef#getBufferProvider <em>Buffer Provider</em>}</li>
- * <li>{@link org.eclipse.net4j.defs.AcceptorDef#getExecutorService <em>Executor Service</em>}</li>
- * <li>{@link org.eclipse.net4j.defs.AcceptorDef#getNegotiator <em>Negotiator</em>}</li>
- * <li>{@link org.eclipse.net4j.defs.AcceptorDef#getServerProtocolProvider <em>Server Protocol Provider</em>}</li>
+ *   <li>{@link org.eclipse.net4j.defs.AcceptorDef#getBufferProvider <em>Buffer Provider</em>}</li>
+ *   <li>{@link org.eclipse.net4j.defs.AcceptorDef#getExecutorService <em>Executor Service</em>}</li>
+ *   <li>{@link org.eclipse.net4j.defs.AcceptorDef#getNegotiator <em>Negotiator</em>}</li>
+ *   <li>{@link org.eclipse.net4j.defs.AcceptorDef#getServerProtocolProvider <em>Server Protocol Provider</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.net4j.defs.Net4jDefsPackage#getAcceptorDef()
  * @model abstract="true"
  * @generated
@@ -36,13 +37,13 @@ import org.eclipse.emf.common.util.EList;
 public interface AcceptorDef extends Def
 {
   /**
-   * Returns the value of the '<em><b>Buffer Provider</b></em>' reference. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Buffer Provider</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Buffer Provider</em>' reference isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Buffer Provider</em>' reference.
    * @see #setBufferProvider(BufferPoolDef)
    * @see org.eclipse.net4j.defs.Net4jDefsPackage#getAcceptorDef_BufferProvider()
@@ -52,24 +53,22 @@ public interface AcceptorDef extends Def
   BufferPoolDef getBufferProvider();
 
   /**
-   * Sets the value of the '{@link org.eclipse.net4j.defs.AcceptorDef#getBufferProvider <em>Buffer Provider</em>}'
-   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Buffer Provider</em>' reference.
+   * Sets the value of the '{@link org.eclipse.net4j.defs.AcceptorDef#getBufferProvider <em>Buffer Provider</em>}' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>Buffer Provider</em>' reference.
    * @see #getBufferProvider()
    * @generated
    */
   void setBufferProvider(BufferPoolDef value);
 
   /**
-   * Returns the value of the '<em><b>Executor Service</b></em>' reference. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Executor Service</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Executor Service</em>' reference isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Executor Service</em>' reference.
    * @see #setExecutorService(ThreadPoolDef)
    * @see org.eclipse.net4j.defs.Net4jDefsPackage#getAcceptorDef_ExecutorService()
@@ -79,24 +78,22 @@ public interface AcceptorDef extends Def
   ThreadPoolDef getExecutorService();
 
   /**
-   * Sets the value of the '{@link org.eclipse.net4j.defs.AcceptorDef#getExecutorService <em>Executor Service</em>}'
-   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Executor Service</em>' reference.
+   * Sets the value of the '{@link org.eclipse.net4j.defs.AcceptorDef#getExecutorService <em>Executor Service</em>}' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>Executor Service</em>' reference.
    * @see #getExecutorService()
    * @generated
    */
   void setExecutorService(ThreadPoolDef value);
 
   /**
-   * Returns the value of the '<em><b>Negotiator</b></em>' reference. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Negotiator</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Negotiator</em>' reference isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Negotiator</em>' reference.
    * @see #isSetNegotiator()
    * @see #unsetNegotiator()
@@ -110,9 +107,7 @@ public interface AcceptorDef extends Def
   /**
    * Sets the value of the '{@link org.eclipse.net4j.defs.AcceptorDef#getNegotiator <em>Negotiator</em>}' reference.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Negotiator</em>' reference.
+   * @param value the new value of the '<em>Negotiator</em>' reference.
    * @see #isSetNegotiator()
    * @see #unsetNegotiator()
    * @see #getNegotiator()
@@ -123,7 +118,6 @@ public interface AcceptorDef extends Def
   /**
    * Unsets the value of the '{@link org.eclipse.net4j.defs.AcceptorDef#getNegotiator <em>Negotiator</em>}' reference.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @see #isSetNegotiator()
    * @see #getNegotiator()
    * @see #setNegotiator(NegotiatorDef)
@@ -132,9 +126,8 @@ public interface AcceptorDef extends Def
   void unsetNegotiator();
 
   /**
-   * Returns whether the value of the '{@link org.eclipse.net4j.defs.AcceptorDef#getNegotiator <em>Negotiator</em>}'
-   * reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns whether the value of the '{@link org.eclipse.net4j.defs.AcceptorDef#getNegotiator <em>Negotiator</em>}' reference is set.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return whether the value of the '<em>Negotiator</em>' reference is set.
    * @see #unsetNegotiator()
    * @see #getNegotiator()
@@ -144,14 +137,14 @@ public interface AcceptorDef extends Def
   boolean isSetNegotiator();
 
   /**
-   * Returns the value of the '<em><b>Server Protocol Provider</b></em>' reference list. The list contents are of type
-   * {@link org.eclipse.net4j.defs.ServerProtocolFactoryDef}. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Server Protocol Provider</b></em>' reference list.
+   * The list contents are of type {@link org.eclipse.net4j.defs.ServerProtocolFactoryDef}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Server Protocol Provider</em>' reference list isn't clear, there really should be more
    * of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Server Protocol Provider</em>' reference list.
    * @see #isSetServerProtocolProvider()
    * @see #unsetServerProtocolProvider()
@@ -162,9 +155,8 @@ public interface AcceptorDef extends Def
   EList<ServerProtocolFactoryDef> getServerProtocolProvider();
 
   /**
-   * Unsets the value of the '{@link org.eclipse.net4j.defs.AcceptorDef#getServerProtocolProvider
-   * <em>Server Protocol Provider</em>}' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Unsets the value of the '{@link org.eclipse.net4j.defs.AcceptorDef#getServerProtocolProvider <em>Server Protocol Provider</em>}' reference list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #isSetServerProtocolProvider()
    * @see #getServerProtocolProvider()
    * @generated
@@ -172,9 +164,8 @@ public interface AcceptorDef extends Def
   void unsetServerProtocolProvider();
 
   /**
-   * Returns whether the value of the '{@link org.eclipse.net4j.defs.AcceptorDef#getServerProtocolProvider
-   * <em>Server Protocol Provider</em>}' reference list is set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns whether the value of the '{@link org.eclipse.net4j.defs.AcceptorDef#getServerProtocolProvider <em>Server Protocol Provider</em>}' reference list is set.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return whether the value of the '<em>Server Protocol Provider</em>' reference list is set.
    * @see #unsetServerProtocolProvider()
    * @see #getServerProtocolProvider()
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 0335861012..ea011d2b16 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
@@ -13,7 +13,8 @@ package org.eclipse.net4j.defs;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Buffer Pool Def</b></em>'. <!-- end-user-doc -->
- * 
+ *
+ *
  * @see org.eclipse.net4j.defs.Net4jDefsPackage#getBufferPoolDef()
  * @model
  * @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 34b50b9425..b645775c43 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
@@ -14,7 +14,8 @@ package org.eclipse.net4j.defs;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Client Protocol Factory Def</b></em>'. <!--
  * end-user-doc -->
- * 
+ *
+ *
  * @see org.eclipse.net4j.defs.Net4jDefsPackage#getClientProtocolFactoryDef()
  * @model abstract="true"
  * @generated
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 eaf1d0568c..5806e5dc55 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
@@ -19,17 +19,18 @@ import org.eclipse.emf.common.util.EList;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Connector Def</b></em>'. <!-- end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.net4j.defs.ConnectorDef#getUserID <em>User ID</em>}</li>
- * <li>{@link org.eclipse.net4j.defs.ConnectorDef#getBufferProvider <em>Buffer Provider</em>}</li>
- * <li>{@link org.eclipse.net4j.defs.ConnectorDef#getExecutorService <em>Executor Service</em>}</li>
- * <li>{@link org.eclipse.net4j.defs.ConnectorDef#getNegotiator <em>Negotiator</em>}</li>
- * <li>{@link org.eclipse.net4j.defs.ConnectorDef#getClientProtocolProvider <em>Client Protocol Provider</em>}</li>
+ *   <li>{@link org.eclipse.net4j.defs.ConnectorDef#getUserID <em>User ID</em>}</li>
+ *   <li>{@link org.eclipse.net4j.defs.ConnectorDef#getBufferProvider <em>Buffer Provider</em>}</li>
+ *   <li>{@link org.eclipse.net4j.defs.ConnectorDef#getExecutorService <em>Executor Service</em>}</li>
+ *   <li>{@link org.eclipse.net4j.defs.ConnectorDef#getNegotiator <em>Negotiator</em>}</li>
+ *   <li>{@link org.eclipse.net4j.defs.ConnectorDef#getClientProtocolProvider <em>Client Protocol Provider</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.net4j.defs.Net4jDefsPackage#getConnectorDef()
  * @model abstract="true"
  * @generated
@@ -37,13 +38,13 @@ import org.eclipse.emf.common.util.EList;
 public interface ConnectorDef extends Def
 {
   /**
-   * Returns the value of the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>User ID</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>User ID</em>' attribute isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>User ID</em>' attribute.
    * @see #isSetUserID()
    * @see #unsetUserID()
@@ -79,9 +80,8 @@ public interface ConnectorDef extends Def
   void unsetUserID();
 
   /**
-   * Returns whether the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getUserID <em>User ID</em>}' attribute
-   * is set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns whether the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getUserID <em>User ID</em>}' attribute is set.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return whether the value of the '<em>User ID</em>' attribute is set.
    * @see #unsetUserID()
    * @see #getUserID()
@@ -91,13 +91,13 @@ public interface ConnectorDef extends Def
   boolean isSetUserID();
 
   /**
-   * Returns the value of the '<em><b>Buffer Provider</b></em>' reference. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Buffer Provider</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Buffer Provider</em>' reference isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Buffer Provider</em>' reference.
    * @see #setBufferProvider(BufferProviderDef)
    * @see org.eclipse.net4j.defs.Net4jDefsPackage#getConnectorDef_BufferProvider()
@@ -107,24 +107,22 @@ public interface ConnectorDef extends Def
   BufferProviderDef getBufferProvider();
 
   /**
-   * Sets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getBufferProvider <em>Buffer Provider</em>}'
-   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Buffer Provider</em>' reference.
+   * Sets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getBufferProvider <em>Buffer Provider</em>}' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>Buffer Provider</em>' reference.
    * @see #getBufferProvider()
    * @generated
    */
   void setBufferProvider(BufferProviderDef value);
 
   /**
-   * Returns the value of the '<em><b>Executor Service</b></em>' reference. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Executor Service</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Executor Service</em>' reference isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Executor Service</em>' reference.
    * @see #setExecutorService(ExecutorServiceDef)
    * @see org.eclipse.net4j.defs.Net4jDefsPackage#getConnectorDef_ExecutorService()
@@ -134,24 +132,22 @@ public interface ConnectorDef extends Def
   ExecutorServiceDef getExecutorService();
 
   /**
-   * Sets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getExecutorService <em>Executor Service</em>}'
-   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Executor Service</em>' reference.
+   * Sets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getExecutorService <em>Executor Service</em>}' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>Executor Service</em>' reference.
    * @see #getExecutorService()
    * @generated
    */
   void setExecutorService(ExecutorServiceDef value);
 
   /**
-   * Returns the value of the '<em><b>Negotiator</b></em>' reference. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Negotiator</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Negotiator</em>' reference isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Negotiator</em>' reference.
    * @see #isSetNegotiator()
    * @see #unsetNegotiator()
@@ -165,9 +161,7 @@ public interface ConnectorDef extends Def
   /**
    * Sets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getNegotiator <em>Negotiator</em>}' reference.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Negotiator</em>' reference.
+   * @param value the new value of the '<em>Negotiator</em>' reference.
    * @see #isSetNegotiator()
    * @see #unsetNegotiator()
    * @see #getNegotiator()
@@ -178,7 +172,6 @@ public interface ConnectorDef extends Def
   /**
    * Unsets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getNegotiator <em>Negotiator</em>}' reference.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @see #isSetNegotiator()
    * @see #getNegotiator()
    * @see #setNegotiator(NegotiatorDef)
@@ -187,9 +180,8 @@ public interface ConnectorDef extends Def
   void unsetNegotiator();
 
   /**
-   * Returns whether the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getNegotiator <em>Negotiator</em>}'
-   * reference is set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns whether the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getNegotiator <em>Negotiator</em>}' reference is set.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return whether the value of the '<em>Negotiator</em>' reference is set.
    * @see #unsetNegotiator()
    * @see #getNegotiator()
@@ -199,14 +191,14 @@ public interface ConnectorDef extends Def
   boolean isSetNegotiator();
 
   /**
-   * Returns the value of the '<em><b>Client Protocol Provider</b></em>' reference list. The list contents are of type
-   * {@link org.eclipse.net4j.defs.ClientProtocolFactoryDef}. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Client Protocol Provider</b></em>' reference list.
+   * The list contents are of type {@link org.eclipse.net4j.defs.ClientProtocolFactoryDef}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Client Protocol Provider</em>' reference list isn't clear, there really should be more
    * of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Client Protocol Provider</em>' reference list.
    * @see #isSetClientProtocolProvider()
    * @see #unsetClientProtocolProvider()
@@ -217,9 +209,8 @@ public interface ConnectorDef extends Def
   EList<ClientProtocolFactoryDef> getClientProtocolProvider();
 
   /**
-   * Unsets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getClientProtocolProvider
-   * <em>Client Protocol Provider</em>}' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Unsets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getClientProtocolProvider <em>Client Protocol Provider</em>}' reference list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #isSetClientProtocolProvider()
    * @see #getClientProtocolProvider()
    * @generated
@@ -227,9 +218,8 @@ public interface ConnectorDef extends Def
   void unsetClientProtocolProvider();
 
   /**
-   * Returns whether the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getClientProtocolProvider
-   * <em>Client Protocol Provider</em>}' reference list is set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns whether the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getClientProtocolProvider <em>Client Protocol Provider</em>}' reference list is set.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return whether the value of the '<em>Client Protocol Provider</em>' reference list is set.
    * @see #unsetClientProtocolProvider()
    * @see #getClientProtocolProvider()
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 52f34380ed..e4f1a13351 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
@@ -28,12 +28,12 @@ package org.eclipse.net4j.defs;
 public interface HTTPConnectorDef extends ConnectorDef
 {
   /**
-   * Returns the value of the '<em><b>Url</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Url</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Url</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Url</em>' attribute.
    * @see #setUrl(String)
    * @see org.eclipse.net4j.defs.Net4jDefsPackage#getHTTPConnectorDef_Url()
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 2e694d4e51..93930e8734 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
@@ -28,12 +28,12 @@ package org.eclipse.net4j.defs;
 public interface JVMAcceptorDef extends AcceptorDef
 {
   /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.eclipse.net4j.defs.Net4jDefsPackage#getJVMAcceptorDef_Name()
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 e76621d76e..59a543524c 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
@@ -28,12 +28,12 @@ package org.eclipse.net4j.defs;
 public interface JVMConnectorDef extends ConnectorDef
 {
   /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.eclipse.net4j.defs.Net4jDefsPackage#getJVMConnectorDef_Name()
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 e2bda3711a..00b1f472f4 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
@@ -16,78 +16,77 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
  * the model. <!-- end-user-doc -->
- * 
  * @see org.eclipse.net4j.defs.Net4jDefsPackage
  * @generated
  */
 public interface Net4jDefsFactory extends EFactory
 {
   /**
-   * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The singleton instance of the factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   Net4jDefsFactory eINSTANCE = org.eclipse.net4j.defs.impl.Net4jDefsFactoryImpl.init();
 
   /**
-   * Returns a new object of class '<em>TCP Connector Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>TCP Connector Def</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>TCP Connector Def</em>'.
    * @generated
    */
   TCPConnectorDef createTCPConnectorDef();
 
   /**
-   * Returns a new object of class '<em>TCP Acceptor Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>TCP Acceptor Def</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>TCP Acceptor Def</em>'.
    * @generated
    */
   TCPAcceptorDef createTCPAcceptorDef();
 
   /**
-   * Returns a new object of class '<em>JVM Acceptor Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>JVM Acceptor Def</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>JVM Acceptor Def</em>'.
    * @generated
    */
   JVMAcceptorDef createJVMAcceptorDef();
 
   /**
-   * Returns a new object of class '<em>JVM Connector Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>JVM Connector Def</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>JVM Connector Def</em>'.
    * @generated
    */
   JVMConnectorDef createJVMConnectorDef();
 
   /**
-   * Returns a new object of class '<em>HTTP Connector Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>HTTP Connector Def</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>HTTP Connector Def</em>'.
    * @generated
    */
   HTTPConnectorDef createHTTPConnectorDef();
 
   /**
-   * Returns a new object of class '<em>TCP Selector Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>TCP Selector Def</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>TCP Selector Def</em>'.
    * @generated
    */
   TCPSelectorDef createTCPSelectorDef();
 
   /**
-   * Returns a new object of class '<em>Buffer Pool Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Buffer Pool Def</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Buffer Pool Def</em>'.
    * @generated
    */
   BufferPoolDef createBufferPoolDef();
 
   /**
-   * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the package supported by this factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the package supported by this factory.
    * @generated
    */
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 1c2c31ee25..d05838a4e5 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
@@ -27,7 +27,6 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * 
  * @see org.eclipse.net4j.defs.Net4jDefsFactory
  * @model kind="package"
  * @generated
@@ -35,29 +34,29 @@ import org.eclipse.emf.ecore.EReference;
 public interface Net4jDefsPackage extends EPackage
 {
   /**
-   * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The package name.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   String eNAME = "defs"; //$NON-NLS-1$
 
   /**
-   * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The package namespace URI.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   String eNS_URI = "http://www.eclipse.org/NET4J/defs/1.0.0"; //$NON-NLS-1$
 
   /**
-   * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The package namespace name.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   String eNS_PREFIX = "net4j.defs"; //$NON-NLS-1$
 
   /**
-   * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The singleton instance of the package.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   Net4jDefsPackage eINSTANCE = org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl.init();
@@ -65,7 +64,6 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl <em>Connector Def</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @see org.eclipse.net4j.defs.impl.ConnectorDefImpl
    * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getConnectorDef()
    * @generated
@@ -73,41 +71,41 @@ public interface Net4jDefsPackage extends EPackage
   int CONNECTOR_DEF = 0;
 
   /**
-   * The feature id for the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>User ID</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int CONNECTOR_DEF__USER_ID = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
 
   /**
-   * The feature id for the '<em><b>Buffer Provider</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Buffer Provider</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int CONNECTOR_DEF__BUFFER_PROVIDER = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
 
   /**
-   * The feature id for the '<em><b>Executor Service</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Executor Service</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int CONNECTOR_DEF__EXECUTOR_SERVICE = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 2;
 
   /**
-   * The feature id for the '<em><b>Negotiator</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Negotiator</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int CONNECTOR_DEF__NEGOTIATOR = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 3;
 
   /**
-   * The feature id for the '<em><b>Client Protocol Provider</b></em>' reference list. <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Client Protocol Provider</b></em>' reference list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
@@ -123,9 +121,8 @@ public interface Net4jDefsPackage extends EPackage
   int CONNECTOR_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 5;
 
   /**
-   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.ProtocolProviderDefImpl
-   * <em>Protocol Provider Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.ProtocolProviderDefImpl <em>Protocol Provider Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.net4j.defs.impl.ProtocolProviderDefImpl
    * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getProtocolProviderDef()
    * @generated
@@ -133,18 +130,17 @@ public interface Net4jDefsPackage extends EPackage
   int PROTOCOL_PROVIDER_DEF = 12;
 
   /**
-   * The number of structural features of the '<em>Protocol Provider Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Protocol Provider Def</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int PROTOCOL_PROVIDER_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
 
   /**
-   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.ClientProtocolFactoryDefImpl
-   * <em>Client Protocol Factory Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.ClientProtocolFactoryDefImpl <em>Client Protocol Factory Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.net4j.defs.impl.ClientProtocolFactoryDefImpl
    * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getClientProtocolFactoryDef()
    * @generated
@@ -152,18 +148,17 @@ public interface Net4jDefsPackage extends EPackage
   int CLIENT_PROTOCOL_FACTORY_DEF = 1;
 
   /**
-   * The number of structural features of the '<em>Client Protocol Factory Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Client Protocol Factory Def</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int CLIENT_PROTOCOL_FACTORY_DEF_FEATURE_COUNT = PROTOCOL_PROVIDER_DEF_FEATURE_COUNT + 0;
 
   /**
-   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.TCPConnectorDefImpl <em>TCP Connector Def</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.TCPConnectorDefImpl <em>TCP Connector Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.net4j.defs.impl.TCPConnectorDefImpl
    * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getTCPConnectorDef()
    * @generated
@@ -171,74 +166,74 @@ public interface Net4jDefsPackage extends EPackage
   int TCP_CONNECTOR_DEF = 2;
 
   /**
-   * The feature id for the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>User ID</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int TCP_CONNECTOR_DEF__USER_ID = CONNECTOR_DEF__USER_ID;
 
   /**
-   * The feature id for the '<em><b>Buffer Provider</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Buffer Provider</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int TCP_CONNECTOR_DEF__BUFFER_PROVIDER = CONNECTOR_DEF__BUFFER_PROVIDER;
 
   /**
-   * The feature id for the '<em><b>Executor Service</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Executor Service</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int TCP_CONNECTOR_DEF__EXECUTOR_SERVICE = CONNECTOR_DEF__EXECUTOR_SERVICE;
 
   /**
-   * The feature id for the '<em><b>Negotiator</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Negotiator</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int TCP_CONNECTOR_DEF__NEGOTIATOR = CONNECTOR_DEF__NEGOTIATOR;
 
   /**
-   * The feature id for the '<em><b>Client Protocol Provider</b></em>' reference list. <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Client Protocol Provider</b></em>' reference list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int TCP_CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER = CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER;
 
   /**
-   * The feature id for the '<em><b>Tcp Selector Def</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Tcp Selector Def</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF = CONNECTOR_DEF_FEATURE_COUNT + 0;
 
   /**
-   * The feature id for the '<em><b>Host</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Host</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int TCP_CONNECTOR_DEF__HOST = CONNECTOR_DEF_FEATURE_COUNT + 1;
 
   /**
-   * The feature id for the '<em><b>Port</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Port</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int TCP_CONNECTOR_DEF__PORT = CONNECTOR_DEF_FEATURE_COUNT + 2;
 
   /**
-   * The number of structural features of the '<em>TCP Connector Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>TCP Connector Def</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
@@ -255,33 +250,33 @@ public interface Net4jDefsPackage extends EPackage
   int ACCEPTOR_DEF = 3;
 
   /**
-   * The feature id for the '<em><b>Buffer Provider</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Buffer Provider</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int ACCEPTOR_DEF__BUFFER_PROVIDER = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
 
   /**
-   * The feature id for the '<em><b>Executor Service</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Executor Service</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int ACCEPTOR_DEF__EXECUTOR_SERVICE = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
 
   /**
-   * The feature id for the '<em><b>Negotiator</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Negotiator</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int ACCEPTOR_DEF__NEGOTIATOR = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 2;
 
   /**
-   * The feature id for the '<em><b>Server Protocol Provider</b></em>' reference list. <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Server Protocol Provider</b></em>' reference list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
@@ -297,9 +292,8 @@ public interface Net4jDefsPackage extends EPackage
   int ACCEPTOR_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 4;
 
   /**
-   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.TCPAcceptorDefImpl <em>TCP Acceptor Def</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.TCPAcceptorDefImpl <em>TCP Acceptor Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.net4j.defs.impl.TCPAcceptorDefImpl
    * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getTCPAcceptorDef()
    * @generated
@@ -307,75 +301,74 @@ public interface Net4jDefsPackage extends EPackage
   int TCP_ACCEPTOR_DEF = 4;
 
   /**
-   * The feature id for the '<em><b>Buffer Provider</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Buffer Provider</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int TCP_ACCEPTOR_DEF__BUFFER_PROVIDER = ACCEPTOR_DEF__BUFFER_PROVIDER;
 
   /**
-   * The feature id for the '<em><b>Executor Service</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Executor Service</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int TCP_ACCEPTOR_DEF__EXECUTOR_SERVICE = ACCEPTOR_DEF__EXECUTOR_SERVICE;
 
   /**
-   * The feature id for the '<em><b>Negotiator</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Negotiator</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int TCP_ACCEPTOR_DEF__NEGOTIATOR = ACCEPTOR_DEF__NEGOTIATOR;
 
   /**
-   * The feature id for the '<em><b>Server Protocol Provider</b></em>' reference list. <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Server Protocol Provider</b></em>' reference list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int TCP_ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER = ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER;
 
   /**
-   * The feature id for the '<em><b>Host</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Host</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int TCP_ACCEPTOR_DEF__HOST = ACCEPTOR_DEF_FEATURE_COUNT + 0;
 
   /**
-   * The feature id for the '<em><b>Port</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Port</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int TCP_ACCEPTOR_DEF__PORT = ACCEPTOR_DEF_FEATURE_COUNT + 1;
 
   /**
-   * The feature id for the '<em><b>Tcp Selector Def</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Tcp Selector Def</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF = ACCEPTOR_DEF_FEATURE_COUNT + 2;
 
   /**
-   * The number of structural features of the '<em>TCP Acceptor Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>TCP Acceptor Def</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int TCP_ACCEPTOR_DEF_FEATURE_COUNT = ACCEPTOR_DEF_FEATURE_COUNT + 3;
 
   /**
-   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.JVMAcceptorDefImpl <em>JVM Acceptor Def</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.JVMAcceptorDefImpl <em>JVM Acceptor Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.net4j.defs.impl.JVMAcceptorDefImpl
    * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getJVMAcceptorDef()
    * @generated
@@ -383,59 +376,58 @@ public interface Net4jDefsPackage extends EPackage
   int JVM_ACCEPTOR_DEF = 5;
 
   /**
-   * The feature id for the '<em><b>Buffer Provider</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Buffer Provider</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int JVM_ACCEPTOR_DEF__BUFFER_PROVIDER = ACCEPTOR_DEF__BUFFER_PROVIDER;
 
   /**
-   * The feature id for the '<em><b>Executor Service</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Executor Service</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int JVM_ACCEPTOR_DEF__EXECUTOR_SERVICE = ACCEPTOR_DEF__EXECUTOR_SERVICE;
 
   /**
-   * The feature id for the '<em><b>Negotiator</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Negotiator</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int JVM_ACCEPTOR_DEF__NEGOTIATOR = ACCEPTOR_DEF__NEGOTIATOR;
 
   /**
-   * The feature id for the '<em><b>Server Protocol Provider</b></em>' reference list. <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Server Protocol Provider</b></em>' reference list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int JVM_ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER = ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER;
 
   /**
-   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int JVM_ACCEPTOR_DEF__NAME = ACCEPTOR_DEF_FEATURE_COUNT + 0;
 
   /**
-   * The number of structural features of the '<em>JVM Acceptor Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>JVM Acceptor Def</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int JVM_ACCEPTOR_DEF_FEATURE_COUNT = ACCEPTOR_DEF_FEATURE_COUNT + 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.JVMConnectorDefImpl <em>JVM Connector Def</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.JVMConnectorDefImpl <em>JVM Connector Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.net4j.defs.impl.JVMConnectorDefImpl
    * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getJVMConnectorDef()
    * @generated
@@ -443,67 +435,66 @@ public interface Net4jDefsPackage extends EPackage
   int JVM_CONNECTOR_DEF = 6;
 
   /**
-   * The feature id for the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>User ID</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int JVM_CONNECTOR_DEF__USER_ID = CONNECTOR_DEF__USER_ID;
 
   /**
-   * The feature id for the '<em><b>Buffer Provider</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Buffer Provider</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int JVM_CONNECTOR_DEF__BUFFER_PROVIDER = CONNECTOR_DEF__BUFFER_PROVIDER;
 
   /**
-   * The feature id for the '<em><b>Executor Service</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Executor Service</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int JVM_CONNECTOR_DEF__EXECUTOR_SERVICE = CONNECTOR_DEF__EXECUTOR_SERVICE;
 
   /**
-   * The feature id for the '<em><b>Negotiator</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Negotiator</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int JVM_CONNECTOR_DEF__NEGOTIATOR = CONNECTOR_DEF__NEGOTIATOR;
 
   /**
-   * The feature id for the '<em><b>Client Protocol Provider</b></em>' reference list. <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Client Protocol Provider</b></em>' reference list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int JVM_CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER = CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER;
 
   /**
-   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int JVM_CONNECTOR_DEF__NAME = CONNECTOR_DEF_FEATURE_COUNT + 0;
 
   /**
-   * The number of structural features of the '<em>JVM Connector Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>JVM Connector Def</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int JVM_CONNECTOR_DEF_FEATURE_COUNT = CONNECTOR_DEF_FEATURE_COUNT + 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.HTTPConnectorDefImpl <em>HTTP Connector Def</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.HTTPConnectorDefImpl <em>HTTP Connector Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.net4j.defs.impl.HTTPConnectorDefImpl
    * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getHTTPConnectorDef()
    * @generated
@@ -511,67 +502,66 @@ public interface Net4jDefsPackage extends EPackage
   int HTTP_CONNECTOR_DEF = 7;
 
   /**
-   * The feature id for the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>User ID</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int HTTP_CONNECTOR_DEF__USER_ID = CONNECTOR_DEF__USER_ID;
 
   /**
-   * The feature id for the '<em><b>Buffer Provider</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Buffer Provider</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int HTTP_CONNECTOR_DEF__BUFFER_PROVIDER = CONNECTOR_DEF__BUFFER_PROVIDER;
 
   /**
-   * The feature id for the '<em><b>Executor Service</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Executor Service</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int HTTP_CONNECTOR_DEF__EXECUTOR_SERVICE = CONNECTOR_DEF__EXECUTOR_SERVICE;
 
   /**
-   * The feature id for the '<em><b>Negotiator</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Negotiator</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int HTTP_CONNECTOR_DEF__NEGOTIATOR = CONNECTOR_DEF__NEGOTIATOR;
 
   /**
-   * The feature id for the '<em><b>Client Protocol Provider</b></em>' reference list. <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Client Protocol Provider</b></em>' reference list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int HTTP_CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER = CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER;
 
   /**
-   * The feature id for the '<em><b>Url</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Url</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int HTTP_CONNECTOR_DEF__URL = CONNECTOR_DEF_FEATURE_COUNT + 0;
 
   /**
-   * The number of structural features of the '<em>HTTP Connector Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>HTTP Connector Def</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int HTTP_CONNECTOR_DEF_FEATURE_COUNT = CONNECTOR_DEF_FEATURE_COUNT + 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.TCPSelectorDefImpl <em>TCP Selector Def</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.TCPSelectorDefImpl <em>TCP Selector Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.net4j.defs.impl.TCPSelectorDefImpl
    * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getTCPSelectorDef()
    * @generated
@@ -579,18 +569,17 @@ public interface Net4jDefsPackage extends EPackage
   int TCP_SELECTOR_DEF = 8;
 
   /**
-   * The number of structural features of the '<em>TCP Selector Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>TCP Selector Def</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int TCP_SELECTOR_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
 
   /**
-   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.ServerProtocolFactoryDefImpl
-   * <em>Server Protocol Factory Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.ServerProtocolFactoryDefImpl <em>Server Protocol Factory Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.net4j.defs.impl.ServerProtocolFactoryDefImpl
    * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getServerProtocolFactoryDef()
    * @generated
@@ -598,18 +587,17 @@ public interface Net4jDefsPackage extends EPackage
   int SERVER_PROTOCOL_FACTORY_DEF = 9;
 
   /**
-   * The number of structural features of the '<em>Server Protocol Factory Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Server Protocol Factory Def</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int SERVER_PROTOCOL_FACTORY_DEF_FEATURE_COUNT = PROTOCOL_PROVIDER_DEF_FEATURE_COUNT + 0;
 
   /**
-   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.BufferProviderDefImpl <em>Buffer Provider Def</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.net4j.defs.impl.BufferProviderDefImpl <em>Buffer Provider Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.net4j.defs.impl.BufferProviderDefImpl
    * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getBufferProviderDef()
    * @generated
@@ -617,9 +605,9 @@ public interface Net4jDefsPackage extends EPackage
   int BUFFER_PROVIDER_DEF = 10;
 
   /**
-   * The number of structural features of the '<em>Buffer Provider Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Buffer Provider Def</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
@@ -628,7 +616,6 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.net4j.defs.impl.BufferPoolDefImpl <em>Buffer Pool Def</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @see org.eclipse.net4j.defs.impl.BufferPoolDefImpl
    * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getBufferPoolDef()
    * @generated
@@ -636,9 +623,9 @@ public interface Net4jDefsPackage extends EPackage
   int BUFFER_POOL_DEF = 11;
 
   /**
-   * The number of structural features of the '<em>Buffer Pool Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Buffer Pool Def</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
@@ -657,7 +644,6 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.ConnectorDef#getUserID <em>User ID</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute '<em>User ID</em>'.
    * @see org.eclipse.net4j.defs.ConnectorDef#getUserID()
    * @see #getConnectorDef()
@@ -666,9 +652,8 @@ public interface Net4jDefsPackage extends EPackage
   EAttribute getConnectorDef_UserID();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.ConnectorDef#getBufferProvider
-   * <em>Buffer Provider</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.ConnectorDef#getBufferProvider <em>Buffer Provider</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the reference '<em>Buffer Provider</em>'.
    * @see org.eclipse.net4j.defs.ConnectorDef#getBufferProvider()
    * @see #getConnectorDef()
@@ -677,9 +662,8 @@ public interface Net4jDefsPackage extends EPackage
   EReference getConnectorDef_BufferProvider();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.ConnectorDef#getExecutorService
-   * <em>Executor Service</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.ConnectorDef#getExecutorService <em>Executor Service</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the reference '<em>Executor Service</em>'.
    * @see org.eclipse.net4j.defs.ConnectorDef#getExecutorService()
    * @see #getConnectorDef()
@@ -688,9 +672,8 @@ public interface Net4jDefsPackage extends EPackage
   EReference getConnectorDef_ExecutorService();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.ConnectorDef#getNegotiator
-   * <em>Negotiator</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.ConnectorDef#getNegotiator <em>Negotiator</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the reference '<em>Negotiator</em>'.
    * @see org.eclipse.net4j.defs.ConnectorDef#getNegotiator()
    * @see #getConnectorDef()
@@ -711,9 +694,8 @@ public interface Net4jDefsPackage extends EPackage
   EReference getConnectorDef_ClientProtocolProvider();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.defs.ClientProtocolFactoryDef
-   * <em>Client Protocol Factory Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.net4j.defs.ClientProtocolFactoryDef <em>Client Protocol Factory Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Client Protocol Factory Def</em>'.
    * @see org.eclipse.net4j.defs.ClientProtocolFactoryDef
    * @generated
@@ -731,9 +713,8 @@ public interface Net4jDefsPackage extends EPackage
   EClass getTCPConnectorDef();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.TCPConnectorDef#getTcpSelectorDef
-   * <em>Tcp Selector Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.TCPConnectorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the reference '<em>Tcp Selector Def</em>'.
    * @see org.eclipse.net4j.defs.TCPConnectorDef#getTcpSelectorDef()
    * @see #getTCPConnectorDef()
@@ -744,7 +725,6 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.TCPConnectorDef#getHost <em>Host</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute '<em>Host</em>'.
    * @see org.eclipse.net4j.defs.TCPConnectorDef#getHost()
    * @see #getTCPConnectorDef()
@@ -755,7 +735,6 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.TCPConnectorDef#getPort <em>Port</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute '<em>Port</em>'.
    * @see org.eclipse.net4j.defs.TCPConnectorDef#getPort()
    * @see #getTCPConnectorDef()
@@ -774,9 +753,8 @@ public interface Net4jDefsPackage extends EPackage
   EClass getAcceptorDef();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.AcceptorDef#getBufferProvider
-   * <em>Buffer Provider</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.AcceptorDef#getBufferProvider <em>Buffer Provider</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the reference '<em>Buffer Provider</em>'.
    * @see org.eclipse.net4j.defs.AcceptorDef#getBufferProvider()
    * @see #getAcceptorDef()
@@ -785,9 +763,8 @@ public interface Net4jDefsPackage extends EPackage
   EReference getAcceptorDef_BufferProvider();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.AcceptorDef#getExecutorService
-   * <em>Executor Service</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.AcceptorDef#getExecutorService <em>Executor Service</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the reference '<em>Executor Service</em>'.
    * @see org.eclipse.net4j.defs.AcceptorDef#getExecutorService()
    * @see #getAcceptorDef()
@@ -796,9 +773,8 @@ public interface Net4jDefsPackage extends EPackage
   EReference getAcceptorDef_ExecutorService();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.AcceptorDef#getNegotiator
-   * <em>Negotiator</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.AcceptorDef#getNegotiator <em>Negotiator</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the reference '<em>Negotiator</em>'.
    * @see org.eclipse.net4j.defs.AcceptorDef#getNegotiator()
    * @see #getAcceptorDef()
@@ -831,7 +807,6 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.TCPAcceptorDef#getHost <em>Host</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute '<em>Host</em>'.
    * @see org.eclipse.net4j.defs.TCPAcceptorDef#getHost()
    * @see #getTCPAcceptorDef()
@@ -842,7 +817,6 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.TCPAcceptorDef#getPort <em>Port</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute '<em>Port</em>'.
    * @see org.eclipse.net4j.defs.TCPAcceptorDef#getPort()
    * @see #getTCPAcceptorDef()
@@ -851,9 +825,8 @@ public interface Net4jDefsPackage extends EPackage
   EAttribute getTCPAcceptorDef_Port();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.TCPAcceptorDef#getTcpSelectorDef
-   * <em>Tcp Selector Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.defs.TCPAcceptorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the reference '<em>Tcp Selector Def</em>'.
    * @see org.eclipse.net4j.defs.TCPAcceptorDef#getTcpSelectorDef()
    * @see #getTCPAcceptorDef()
@@ -874,7 +847,6 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.JVMAcceptorDef#getName <em>Name</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.net4j.defs.JVMAcceptorDef#getName()
    * @see #getJVMAcceptorDef()
@@ -895,7 +867,6 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.JVMConnectorDef#getName <em>Name</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.net4j.defs.JVMConnectorDef#getName()
    * @see #getJVMConnectorDef()
@@ -906,7 +877,6 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.defs.HTTPConnectorDef <em>HTTP Connector Def</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @return the meta object for class '<em>HTTP Connector Def</em>'.
    * @see org.eclipse.net4j.defs.HTTPConnectorDef
    * @generated
@@ -916,7 +886,6 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.net4j.defs.HTTPConnectorDef#getUrl <em>Url</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute '<em>Url</em>'.
    * @see org.eclipse.net4j.defs.HTTPConnectorDef#getUrl()
    * @see #getHTTPConnectorDef()
@@ -935,9 +904,8 @@ public interface Net4jDefsPackage extends EPackage
   EClass getTCPSelectorDef();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.defs.ServerProtocolFactoryDef
-   * <em>Server Protocol Factory Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.net4j.defs.ServerProtocolFactoryDef <em>Server Protocol Factory Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Server Protocol Factory Def</em>'.
    * @see org.eclipse.net4j.defs.ServerProtocolFactoryDef
    * @generated
@@ -947,7 +915,6 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.defs.BufferProviderDef <em>Buffer Provider Def</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @return the meta object for class '<em>Buffer Provider Def</em>'.
    * @see org.eclipse.net4j.defs.BufferProviderDef
    * @generated
@@ -965,9 +932,8 @@ public interface Net4jDefsPackage extends EPackage
   EClass getBufferPoolDef();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.defs.ProtocolProviderDef
-   * <em>Protocol Provider Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.net4j.defs.ProtocolProviderDef <em>Protocol Provider Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Protocol Provider Def</em>'.
    * @see org.eclipse.net4j.defs.ProtocolProviderDef
    * @generated
@@ -975,8 +941,8 @@ public interface Net4jDefsPackage extends EPackage
   EClass getProtocolProviderDef();
 
   /**
-   * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the factory that creates the instances of the model.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the factory that creates the instances of the model.
    * @generated
    */
@@ -991,15 +957,13 @@ public interface Net4jDefsPackage extends EPackage
    * <li>and each data type</li>
    * </ul>
    * <!-- end-user-doc -->
-   * 
    * @generated
    */
   interface Literals
   {
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl <em>Connector Def</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl <em>Connector Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.net4j.defs.impl.ConnectorDefImpl
      * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getConnectorDef()
      * @generated
@@ -1007,33 +971,33 @@ public interface Net4jDefsPackage extends EPackage
     EClass CONNECTOR_DEF = eINSTANCE.getConnectorDef();
 
     /**
-     * The meta object literal for the '<em><b>User ID</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>User ID</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute CONNECTOR_DEF__USER_ID = eINSTANCE.getConnectorDef_UserID();
 
     /**
-     * The meta object literal for the '<em><b>Buffer Provider</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Buffer Provider</b></em>' reference feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EReference CONNECTOR_DEF__BUFFER_PROVIDER = eINSTANCE.getConnectorDef_BufferProvider();
 
     /**
-     * The meta object literal for the '<em><b>Executor Service</b></em>' reference feature. <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Executor Service</b></em>' reference feature.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
      * @generated
      */
     EReference CONNECTOR_DEF__EXECUTOR_SERVICE = eINSTANCE.getConnectorDef_ExecutorService();
 
     /**
-     * The meta object literal for the '<em><b>Negotiator</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Negotiator</b></em>' reference feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EReference CONNECTOR_DEF__NEGOTIATOR = eINSTANCE.getConnectorDef_Negotiator();
@@ -1047,9 +1011,8 @@ public interface Net4jDefsPackage extends EPackage
     EReference CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER = eINSTANCE.getConnectorDef_ClientProtocolProvider();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.ClientProtocolFactoryDefImpl
-     * <em>Client Protocol Factory Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.ClientProtocolFactoryDefImpl <em>Client Protocol Factory Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.net4j.defs.impl.ClientProtocolFactoryDefImpl
      * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getClientProtocolFactoryDef()
      * @generated
@@ -1057,9 +1020,8 @@ public interface Net4jDefsPackage extends EPackage
     EClass CLIENT_PROTOCOL_FACTORY_DEF = eINSTANCE.getClientProtocolFactoryDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.TCPConnectorDefImpl
-     * <em>TCP Connector Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.TCPConnectorDefImpl <em>TCP Connector Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.net4j.defs.impl.TCPConnectorDefImpl
      * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getTCPConnectorDef()
      * @generated
@@ -1067,33 +1029,32 @@ public interface Net4jDefsPackage extends EPackage
     EClass TCP_CONNECTOR_DEF = eINSTANCE.getTCPConnectorDef();
 
     /**
-     * The meta object literal for the '<em><b>Tcp Selector Def</b></em>' reference feature. <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Tcp Selector Def</b></em>' reference feature.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
      * @generated
      */
     EReference TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF = eINSTANCE.getTCPConnectorDef_TcpSelectorDef();
 
     /**
-     * The meta object literal for the '<em><b>Host</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Host</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute TCP_CONNECTOR_DEF__HOST = eINSTANCE.getTCPConnectorDef_Host();
 
     /**
-     * The meta object literal for the '<em><b>Port</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Port</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute TCP_CONNECTOR_DEF__PORT = eINSTANCE.getTCPConnectorDef_Port();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.AcceptorDefImpl <em>Acceptor Def</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal 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
@@ -1101,25 +1062,25 @@ public interface Net4jDefsPackage extends EPackage
     EClass ACCEPTOR_DEF = eINSTANCE.getAcceptorDef();
 
     /**
-     * The meta object literal for the '<em><b>Buffer Provider</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Buffer Provider</b></em>' reference feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EReference ACCEPTOR_DEF__BUFFER_PROVIDER = eINSTANCE.getAcceptorDef_BufferProvider();
 
     /**
-     * The meta object literal for the '<em><b>Executor Service</b></em>' reference feature. <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Executor Service</b></em>' reference feature.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
      * @generated
      */
     EReference ACCEPTOR_DEF__EXECUTOR_SERVICE = eINSTANCE.getAcceptorDef_ExecutorService();
 
     /**
-     * The meta object literal for the '<em><b>Negotiator</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Negotiator</b></em>' reference feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EReference ACCEPTOR_DEF__NEGOTIATOR = eINSTANCE.getAcceptorDef_Negotiator();
@@ -1133,9 +1094,8 @@ public interface Net4jDefsPackage extends EPackage
     EReference ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER = eINSTANCE.getAcceptorDef_ServerProtocolProvider();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.TCPAcceptorDefImpl <em>TCP Acceptor Def</em>}
-     * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.TCPAcceptorDefImpl <em>TCP Acceptor Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.net4j.defs.impl.TCPAcceptorDefImpl
      * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getTCPAcceptorDef()
      * @generated
@@ -1143,33 +1103,32 @@ public interface Net4jDefsPackage extends EPackage
     EClass TCP_ACCEPTOR_DEF = eINSTANCE.getTCPAcceptorDef();
 
     /**
-     * The meta object literal for the '<em><b>Host</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Host</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute TCP_ACCEPTOR_DEF__HOST = eINSTANCE.getTCPAcceptorDef_Host();
 
     /**
-     * The meta object literal for the '<em><b>Port</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Port</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute TCP_ACCEPTOR_DEF__PORT = eINSTANCE.getTCPAcceptorDef_Port();
 
     /**
-     * The meta object literal for the '<em><b>Tcp Selector Def</b></em>' reference feature. <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Tcp Selector Def</b></em>' reference feature.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
      * @generated
      */
     EReference TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF = eINSTANCE.getTCPAcceptorDef_TcpSelectorDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.JVMAcceptorDefImpl <em>JVM Acceptor Def</em>}
-     * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.JVMAcceptorDefImpl <em>JVM Acceptor Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.net4j.defs.impl.JVMAcceptorDefImpl
      * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getJVMAcceptorDef()
      * @generated
@@ -1177,17 +1136,16 @@ public interface Net4jDefsPackage extends EPackage
     EClass JVM_ACCEPTOR_DEF = eINSTANCE.getJVMAcceptorDef();
 
     /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute JVM_ACCEPTOR_DEF__NAME = eINSTANCE.getJVMAcceptorDef_Name();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.JVMConnectorDefImpl
-     * <em>JVM Connector Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.JVMConnectorDefImpl <em>JVM Connector Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.net4j.defs.impl.JVMConnectorDefImpl
      * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getJVMConnectorDef()
      * @generated
@@ -1195,17 +1153,16 @@ public interface Net4jDefsPackage extends EPackage
     EClass JVM_CONNECTOR_DEF = eINSTANCE.getJVMConnectorDef();
 
     /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute JVM_CONNECTOR_DEF__NAME = eINSTANCE.getJVMConnectorDef_Name();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.HTTPConnectorDefImpl
-     * <em>HTTP Connector Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.HTTPConnectorDefImpl <em>HTTP Connector Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.net4j.defs.impl.HTTPConnectorDefImpl
      * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getHTTPConnectorDef()
      * @generated
@@ -1213,17 +1170,16 @@ public interface Net4jDefsPackage extends EPackage
     EClass HTTP_CONNECTOR_DEF = eINSTANCE.getHTTPConnectorDef();
 
     /**
-     * The meta object literal for the '<em><b>Url</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Url</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute HTTP_CONNECTOR_DEF__URL = eINSTANCE.getHTTPConnectorDef_Url();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.TCPSelectorDefImpl <em>TCP Selector Def</em>}
-     * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.TCPSelectorDefImpl <em>TCP Selector Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.net4j.defs.impl.TCPSelectorDefImpl
      * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getTCPSelectorDef()
      * @generated
@@ -1231,9 +1187,8 @@ public interface Net4jDefsPackage extends EPackage
     EClass TCP_SELECTOR_DEF = eINSTANCE.getTCPSelectorDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.ServerProtocolFactoryDefImpl
-     * <em>Server Protocol Factory Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.ServerProtocolFactoryDefImpl <em>Server Protocol Factory Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.net4j.defs.impl.ServerProtocolFactoryDefImpl
      * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getServerProtocolFactoryDef()
      * @generated
@@ -1241,9 +1196,8 @@ public interface Net4jDefsPackage extends EPackage
     EClass SERVER_PROTOCOL_FACTORY_DEF = eINSTANCE.getServerProtocolFactoryDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.BufferProviderDefImpl
-     * <em>Buffer Provider Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.BufferProviderDefImpl <em>Buffer Provider Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.net4j.defs.impl.BufferProviderDefImpl
      * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getBufferProviderDef()
      * @generated
@@ -1251,9 +1205,8 @@ public interface Net4jDefsPackage extends EPackage
     EClass BUFFER_PROVIDER_DEF = eINSTANCE.getBufferProviderDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.BufferPoolDefImpl <em>Buffer Pool Def</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.BufferPoolDefImpl <em>Buffer Pool Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.net4j.defs.impl.BufferPoolDefImpl
      * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getBufferPoolDef()
      * @generated
@@ -1261,9 +1214,8 @@ public interface Net4jDefsPackage extends EPackage
     EClass BUFFER_POOL_DEF = eINSTANCE.getBufferPoolDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.ProtocolProviderDefImpl
-     * <em>Protocol Provider Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.net4j.defs.impl.ProtocolProviderDefImpl <em>Protocol Provider Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.net4j.defs.impl.ProtocolProviderDefImpl
      * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getProtocolProviderDef()
      * @generated
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 eca7bf731d..27b284df67 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
@@ -16,7 +16,8 @@ import org.eclipse.net4j.util.defs.Def;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Protocol Provider Def</b></em>'. <!--
  * end-user-doc -->
- * 
+ *
+ *
  * @see org.eclipse.net4j.defs.Net4jDefsPackage#getProtocolProviderDef()
  * @model abstract="true"
  * @generated
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 ce079c210a..160e332e65 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
@@ -14,7 +14,8 @@ package org.eclipse.net4j.defs;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Server Protocol Factory Def</b></em>'. <!--
  * end-user-doc -->
- * 
+ *
+ *
  * @see org.eclipse.net4j.defs.Net4jDefsPackage#getServerProtocolFactoryDef()
  * @model abstract="true"
  * @generated
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 bf3e08e54c..94194836a4 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
@@ -30,12 +30,12 @@ package org.eclipse.net4j.defs;
 public interface TCPAcceptorDef extends AcceptorDef
 {
   /**
-   * Returns the value of the '<em><b>Host</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Host</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Host</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Host</em>' attribute.
    * @see #setHost(String)
    * @see org.eclipse.net4j.defs.Net4jDefsPackage#getTCPAcceptorDef_Host()
@@ -56,12 +56,12 @@ public interface TCPAcceptorDef extends AcceptorDef
   void setHost(String value);
 
   /**
-   * Returns the value of the '<em><b>Port</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Port</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Port</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Port</em>' attribute.
    * @see #setPort(int)
    * @see org.eclipse.net4j.defs.Net4jDefsPackage#getTCPAcceptorDef_Port()
@@ -82,13 +82,13 @@ public interface TCPAcceptorDef extends AcceptorDef
   void setPort(int value);
 
   /**
-   * Returns the value of the '<em><b>Tcp Selector Def</b></em>' reference. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Tcp Selector Def</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Tcp Selector Def</em>' reference isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Tcp Selector Def</em>' reference.
    * @see #setTcpSelectorDef(TCPSelectorDef)
    * @see org.eclipse.net4j.defs.Net4jDefsPackage#getTCPAcceptorDef_TcpSelectorDef()
@@ -98,11 +98,9 @@ public interface TCPAcceptorDef extends AcceptorDef
   TCPSelectorDef getTcpSelectorDef();
 
   /**
-   * Sets the value of the '{@link org.eclipse.net4j.defs.TCPAcceptorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}'
-   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Tcp Selector Def</em>' reference.
+   * Sets the value of the '{@link org.eclipse.net4j.defs.TCPAcceptorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>Tcp Selector Def</em>' reference.
    * @see #getTcpSelectorDef()
    * @generated
    */
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 7136d995e9..265317cf3e 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
@@ -30,13 +30,13 @@ package org.eclipse.net4j.defs;
 public interface TCPConnectorDef extends ConnectorDef
 {
   /**
-   * Returns the value of the '<em><b>Tcp Selector Def</b></em>' reference. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Tcp Selector Def</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Tcp Selector Def</em>' reference isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Tcp Selector Def</em>' reference.
    * @see #setTcpSelectorDef(TCPSelectorDef)
    * @see org.eclipse.net4j.defs.Net4jDefsPackage#getTCPConnectorDef_TcpSelectorDef()
@@ -46,23 +46,21 @@ public interface TCPConnectorDef extends ConnectorDef
   TCPSelectorDef getTcpSelectorDef();
 
   /**
-   * Sets the value of the '{@link org.eclipse.net4j.defs.TCPConnectorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}'
-   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Tcp Selector Def</em>' reference.
+   * Sets the value of the '{@link org.eclipse.net4j.defs.TCPConnectorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>Tcp Selector Def</em>' reference.
    * @see #getTcpSelectorDef()
    * @generated
    */
   void setTcpSelectorDef(TCPSelectorDef value);
 
   /**
-   * Returns the value of the '<em><b>Host</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Host</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Host</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Host</em>' attribute.
    * @see #setHost(String)
    * @see org.eclipse.net4j.defs.Net4jDefsPackage#getTCPConnectorDef_Host()
@@ -83,12 +81,12 @@ public interface TCPConnectorDef extends ConnectorDef
   void setHost(String value);
 
   /**
-   * Returns the value of the '<em><b>Port</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Port</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Port</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Port</em>' attribute.
    * @see #isSetPort()
    * @see #unsetPort()
@@ -124,9 +122,8 @@ public interface TCPConnectorDef extends ConnectorDef
   void unsetPort();
 
   /**
-   * Returns whether the value of the '{@link org.eclipse.net4j.defs.TCPConnectorDef#getPort <em>Port</em>}' attribute
-   * is set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns whether the value of the '{@link org.eclipse.net4j.defs.TCPConnectorDef#getPort <em>Port</em>}' attribute is set.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return whether the value of the '<em>Port</em>' attribute is set.
    * @see #unsetPort()
    * @see #getPort()
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 817b115467..63675957a7 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
@@ -41,21 +41,21 @@ import java.util.concurrent.ExecutorService;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.net4j.defs.impl.AcceptorDefImpl#getBufferProvider <em>Buffer Provider</em>}</li>
- * <li>{@link org.eclipse.net4j.defs.impl.AcceptorDefImpl#getExecutorService <em>Executor Service</em>}</li>
- * <li>{@link org.eclipse.net4j.defs.impl.AcceptorDefImpl#getNegotiator <em>Negotiator</em>}</li>
- * <li>{@link org.eclipse.net4j.defs.impl.AcceptorDefImpl#getServerProtocolProvider <em>Server Protocol Provider</em>}</li>
+ *   <li>{@link org.eclipse.net4j.defs.impl.AcceptorDefImpl#getBufferProvider <em>Buffer Provider</em>}</li>
+ *   <li>{@link org.eclipse.net4j.defs.impl.AcceptorDefImpl#getExecutorService <em>Executor Service</em>}</li>
+ *   <li>{@link org.eclipse.net4j.defs.impl.AcceptorDefImpl#getNegotiator <em>Negotiator</em>}</li>
+ *   <li>{@link org.eclipse.net4j.defs.impl.AcceptorDefImpl#getServerProtocolProvider <em>Server Protocol Provider</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
 {
   /**
-   * The cached value of the '{@link #getBufferProvider() <em>Buffer Provider</em>}' reference. <!-- begin-user-doc -->
+   * The cached value of the '{@link #getBufferProvider() <em>Buffer Provider</em>}' reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @see #getBufferProvider()
    * @generated
    * @ordered
@@ -63,9 +63,9 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
   protected BufferPoolDef bufferProvider;
 
   /**
-   * The cached value of the '{@link #getExecutorService() <em>Executor Service</em>}' reference. <!-- begin-user-doc
+   * The cached value of the '{@link #getExecutorService() <em>Executor Service</em>}' reference.
+   * <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
    * @see #getExecutorService()
    * @generated
    * @ordered
@@ -73,9 +73,9 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
   protected ThreadPoolDef executorService;
 
   /**
-   * The cached value of the '{@link #getNegotiator() <em>Negotiator</em>}' reference. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getNegotiator() <em>Negotiator</em>}' reference.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getNegotiator()
    * @generated
    * @ordered
@@ -83,8 +83,8 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
   protected NegotiatorDef negotiator;
 
   /**
-   * This is true if the Negotiator reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This is true if the Negotiator reference has been set.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -93,7 +93,6 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
   /**
    * The cached value of the '{@link #getServerProtocolProvider() <em>Server Protocol Provider</em>}' reference list.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @see #getServerProtocolProvider()
    * @generated
    * @ordered
@@ -102,7 +101,6 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected AcceptorDefImpl()
@@ -112,7 +110,6 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -123,7 +120,6 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public BufferPoolDef getBufferProvider()
@@ -135,10 +131,8 @@ 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;
@@ -146,7 +140,6 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public BufferPoolDef basicGetBufferProvider()
@@ -156,7 +149,6 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setBufferProvider(BufferPoolDef newBufferProvider)
@@ -164,15 +156,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public ThreadPoolDef getExecutorService()
@@ -184,10 +173,8 @@ 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;
@@ -195,7 +182,6 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public ThreadPoolDef basicGetExecutorService()
@@ -205,7 +191,6 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setExecutorService(ThreadPoolDef newExecutorService)
@@ -213,15 +198,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public NegotiatorDef getNegotiator()
@@ -233,10 +215,8 @@ 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;
@@ -244,7 +224,6 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public NegotiatorDef basicGetNegotiator()
@@ -254,7 +233,6 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setNegotiator(NegotiatorDef newNegotiator)
@@ -264,15 +242,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void unsetNegotiator()
@@ -282,15 +257,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public boolean isSetNegotiator()
@@ -300,7 +272,6 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EList<ServerProtocolFactoryDef> getServerProtocolProvider()
@@ -315,20 +286,16 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void unsetServerProtocolProvider()
   {
     if (serverProtocolProvider != null)
-    {
       ((InternalEList.Unsettable<?>)serverProtocolProvider).unset();
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public boolean isSetServerProtocolProvider()
@@ -338,7 +305,6 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -348,21 +314,15 @@ 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();
@@ -372,7 +332,6 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -400,7 +359,6 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -426,7 +384,6 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
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 34df83e566..5135e36b88 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
@@ -30,7 +30,6 @@ public class BufferPoolDefImpl extends BufferProviderDefImpl implements BufferPo
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected BufferPoolDefImpl()
@@ -40,7 +39,6 @@ public class BufferPoolDefImpl extends BufferProviderDefImpl implements BufferPo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @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 aedbf54809..d3555d2323 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
@@ -22,14 +22,13 @@ import org.eclipse.emf.ecore.EClass;
  * end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class BufferProviderDefImpl extends DefImpl implements BufferProviderDef
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected BufferProviderDefImpl()
@@ -39,7 +38,6 @@ public abstract class BufferProviderDefImpl extends DefImpl implements BufferPro
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
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 380225f3c7..ac94458de9 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
@@ -21,14 +21,13 @@ import org.eclipse.emf.ecore.EClass;
  * end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class ClientProtocolFactoryDefImpl extends ProtocolProviderDefImpl implements ClientProtocolFactoryDef
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected ClientProtocolFactoryDefImpl()
@@ -38,7 +37,6 @@ public abstract class ClientProtocolFactoryDefImpl extends ProtocolProviderDefIm
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
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 0e188b1a7c..448a1a60be 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
@@ -42,22 +42,22 @@ import java.util.concurrent.ExecutorService;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl#getUserID <em>User ID</em>}</li>
- * <li>{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl#getBufferProvider <em>Buffer Provider</em>}</li>
- * <li>{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl#getExecutorService <em>Executor Service</em>}</li>
- * <li>{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl#getNegotiator <em>Negotiator</em>}</li>
- * <li>{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl#getClientProtocolProvider <em>Client Protocol Provider</em>}</li>
+ *   <li>{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl#getUserID <em>User ID</em>}</li>
+ *   <li>{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl#getBufferProvider <em>Buffer Provider</em>}</li>
+ *   <li>{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl#getExecutorService <em>Executor Service</em>}</li>
+ *   <li>{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl#getNegotiator <em>Negotiator</em>}</li>
+ *   <li>{@link org.eclipse.net4j.defs.impl.ConnectorDefImpl#getClientProtocolProvider <em>Client Protocol Provider</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
 {
   /**
-   * The default value of the '{@link #getUserID() <em>User ID</em>}' attribute. <!-- begin-user-doc --> <!--
+   * The default value of the '{@link #getUserID() <em>User ID</em>}' attribute.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getUserID()
    * @generated
    * @ordered
@@ -65,9 +65,9 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
   protected static final String USER_ID_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getUserID() <em>User ID</em>}' attribute. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getUserID() <em>User ID</em>}' attribute.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getUserID()
    * @generated
    * @ordered
@@ -75,17 +75,17 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
   protected String userID = USER_ID_EDEFAULT;
 
   /**
-   * This is true if the User ID attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This is true if the User ID attribute has been set.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   protected boolean userIDESet;
 
   /**
-   * The cached value of the '{@link #getBufferProvider() <em>Buffer Provider</em>}' reference. <!-- begin-user-doc -->
+   * The cached value of the '{@link #getBufferProvider() <em>Buffer Provider</em>}' reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @see #getBufferProvider()
    * @generated
    * @ordered
@@ -93,9 +93,9 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
   protected BufferProviderDef bufferProvider;
 
   /**
-   * The cached value of the '{@link #getExecutorService() <em>Executor Service</em>}' reference. <!-- begin-user-doc
+   * The cached value of the '{@link #getExecutorService() <em>Executor Service</em>}' reference.
+   * <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
    * @see #getExecutorService()
    * @generated
    * @ordered
@@ -103,9 +103,9 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
   protected ExecutorServiceDef executorService;
 
   /**
-   * The cached value of the '{@link #getNegotiator() <em>Negotiator</em>}' reference. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getNegotiator() <em>Negotiator</em>}' reference.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getNegotiator()
    * @generated
    * @ordered
@@ -113,8 +113,8 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
   protected NegotiatorDef negotiator;
 
   /**
-   * This is true if the Negotiator reference has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This is true if the Negotiator reference has been set.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -123,7 +123,6 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
   /**
    * The cached value of the '{@link #getClientProtocolProvider() <em>Client Protocol Provider</em>}' reference list.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @see #getClientProtocolProvider()
    * @generated
    * @ordered
@@ -132,7 +131,6 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected ConnectorDefImpl()
@@ -142,7 +140,6 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -153,7 +150,6 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getUserID()
@@ -163,7 +159,6 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setUserID(String newUserID)
@@ -173,15 +168,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void unsetUserID()
@@ -191,15 +183,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public boolean isSetUserID()
@@ -209,7 +198,6 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public BufferProviderDef getBufferProvider()
@@ -221,10 +209,8 @@ 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;
@@ -232,7 +218,6 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public BufferProviderDef basicGetBufferProvider()
@@ -242,7 +227,6 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setBufferProvider(BufferProviderDef newBufferProvider)
@@ -250,15 +234,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public ExecutorServiceDef getExecutorService()
@@ -270,10 +251,8 @@ 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;
@@ -281,7 +260,6 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public ExecutorServiceDef basicGetExecutorService()
@@ -291,7 +269,6 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setExecutorService(ExecutorServiceDef newExecutorService)
@@ -299,15 +276,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public NegotiatorDef getNegotiator()
@@ -319,10 +293,8 @@ 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;
@@ -330,7 +302,6 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public NegotiatorDef basicGetNegotiator()
@@ -340,7 +311,6 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setNegotiator(NegotiatorDef newNegotiator)
@@ -350,15 +320,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void unsetNegotiator()
@@ -368,15 +335,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public boolean isSetNegotiator()
@@ -386,7 +350,6 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EList<ClientProtocolFactoryDef> getClientProtocolProvider()
@@ -401,20 +364,16 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void unsetClientProtocolProvider()
   {
     if (clientProtocolProvider != null)
-    {
       ((InternalEList.Unsettable<?>)clientProtocolProvider).unset();
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public boolean isSetClientProtocolProvider()
@@ -424,7 +383,6 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -436,21 +394,15 @@ 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();
@@ -460,7 +412,6 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -491,7 +442,6 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -520,7 +470,6 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -544,27 +493,20 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
   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();
   }
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 3f3dc81267..b0a3886c2e 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
@@ -36,8 +36,8 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnectorDef
 {
   /**
-   * The default value of the '{@link #getUrl() <em>Url</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The default value of the '{@link #getUrl() <em>Url</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #getUrl()
    * @generated
    * @ordered
@@ -45,8 +45,8 @@ public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnec
   protected static final String URL_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getUrl() <em>Url</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The cached value of the '{@link #getUrl() <em>Url</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #getUrl()
    * @generated
    * @ordered
@@ -55,7 +55,6 @@ public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnec
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected HTTPConnectorDefImpl()
@@ -65,7 +64,6 @@ public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnec
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -76,7 +74,6 @@ public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnec
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getUrl()
@@ -86,7 +83,6 @@ public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnec
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setUrl(String newUrl)
@@ -94,14 +90,11 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -117,7 +110,6 @@ public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnec
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -134,7 +126,6 @@ public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnec
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -151,7 +142,6 @@ public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnec
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -167,16 +157,13 @@ public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnec
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
   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 311fc73532..01342b46ca 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
@@ -36,8 +36,8 @@ public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDe
   protected static final String NAME_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #getName()
    * @generated
    * @ordered
@@ -46,7 +46,6 @@ public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected JVMAcceptorDefImpl()
@@ -56,7 +55,6 @@ public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -67,7 +65,6 @@ public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getName()
@@ -77,7 +74,6 @@ public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setName(String newName)
@@ -85,14 +81,11 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -108,7 +101,6 @@ public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -125,7 +117,6 @@ public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -142,7 +133,6 @@ public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -158,16 +148,13 @@ public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
   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/JVMConnectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMConnectorDefImpl.java
index 0b16a84272..7004b0a053 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
@@ -46,8 +46,8 @@ public class JVMConnectorDefImpl extends ConnectorDefImpl implements JVMConnecto
   protected static final String NAME_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #getName()
    * @generated
    * @ordered
@@ -56,7 +56,6 @@ public class JVMConnectorDefImpl extends ConnectorDefImpl implements JVMConnecto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected JVMConnectorDefImpl()
@@ -66,7 +65,6 @@ public class JVMConnectorDefImpl extends ConnectorDefImpl implements JVMConnecto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -77,7 +75,6 @@ public class JVMConnectorDefImpl extends ConnectorDefImpl implements JVMConnecto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getName()
@@ -87,7 +84,6 @@ public class JVMConnectorDefImpl extends ConnectorDefImpl implements JVMConnecto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setName(String newName)
@@ -95,14 +91,11 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -118,7 +111,6 @@ public class JVMConnectorDefImpl extends ConnectorDefImpl implements JVMConnecto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -135,7 +127,6 @@ public class JVMConnectorDefImpl extends ConnectorDefImpl implements JVMConnecto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -152,7 +143,6 @@ public class JVMConnectorDefImpl extends ConnectorDefImpl implements JVMConnecto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -168,16 +158,13 @@ public class JVMConnectorDefImpl extends ConnectorDefImpl implements JVMConnecto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
   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 2e8351a162..f7be3870d1 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
@@ -29,14 +29,13 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- * 
  * @generated
  */
 public class Net4jDefsFactoryImpl extends EFactoryImpl implements Net4jDefsFactory
 {
   /**
-   * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates the default factory implementation.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public static Net4jDefsFactory init()
@@ -58,8 +57,8 @@ public class Net4jDefsFactoryImpl extends EFactoryImpl implements Net4jDefsFacto
   }
 
   /**
-   * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates an instance of the factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public Net4jDefsFactoryImpl()
@@ -69,7 +68,6 @@ public class Net4jDefsFactoryImpl extends EFactoryImpl implements Net4jDefsFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -98,7 +96,6 @@ public class Net4jDefsFactoryImpl extends EFactoryImpl implements Net4jDefsFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public TCPConnectorDef createTCPConnectorDef()
@@ -109,7 +106,6 @@ public class Net4jDefsFactoryImpl extends EFactoryImpl implements Net4jDefsFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public TCPAcceptorDef createTCPAcceptorDef()
@@ -120,7 +116,6 @@ public class Net4jDefsFactoryImpl extends EFactoryImpl implements Net4jDefsFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public JVMAcceptorDef createJVMAcceptorDef()
@@ -131,7 +126,6 @@ public class Net4jDefsFactoryImpl extends EFactoryImpl implements Net4jDefsFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public JVMConnectorDef createJVMConnectorDef()
@@ -142,7 +136,6 @@ public class Net4jDefsFactoryImpl extends EFactoryImpl implements Net4jDefsFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public HTTPConnectorDef createHTTPConnectorDef()
@@ -153,7 +146,6 @@ public class Net4jDefsFactoryImpl extends EFactoryImpl implements Net4jDefsFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public TCPSelectorDef createTCPSelectorDef()
@@ -164,7 +156,6 @@ public class Net4jDefsFactoryImpl extends EFactoryImpl implements Net4jDefsFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public BufferPoolDef createBufferPoolDef()
@@ -175,7 +166,6 @@ public class Net4jDefsFactoryImpl extends EFactoryImpl implements Net4jDefsFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Net4jDefsPackage getNet4jDefsPackage()
@@ -185,7 +175,6 @@ public class Net4jDefsFactoryImpl extends EFactoryImpl implements Net4jDefsFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @deprecated
    * @generated
    */
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 680883f8bd..7dd9cead26 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
@@ -36,98 +36,84 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- * 
  * @generated
  */
 public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPackage
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass connectorDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass clientProtocolFactoryDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass tcpConnectorDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass acceptorDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass tcpAcceptorDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass jvmAcceptorDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass jvmConnectorDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass httpConnectorDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass tcpSelectorDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass serverProtocolFactoryDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass bufferProviderDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass bufferPoolDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass protocolProviderDefEClass = null;
@@ -152,18 +138,17 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private static boolean isInited = false;
 
   /**
    * 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
-   * --> <!-- end-user-doc -->
    * 
+   * <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
+   * --> <!-- end-user-doc -->
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -172,9 +157,7 @@ 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
@@ -201,7 +184,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getConnectorDef()
@@ -211,7 +193,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getConnectorDef_UserID()
@@ -221,7 +202,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getConnectorDef_BufferProvider()
@@ -231,7 +211,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getConnectorDef_ExecutorService()
@@ -241,7 +220,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getConnectorDef_Negotiator()
@@ -251,7 +229,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getConnectorDef_ClientProtocolProvider()
@@ -261,7 +238,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getClientProtocolFactoryDef()
@@ -271,7 +247,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getTCPConnectorDef()
@@ -281,7 +256,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getTCPConnectorDef_TcpSelectorDef()
@@ -291,7 +265,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getTCPConnectorDef_Host()
@@ -301,7 +274,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getTCPConnectorDef_Port()
@@ -311,7 +283,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getAcceptorDef()
@@ -321,7 +292,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getAcceptorDef_BufferProvider()
@@ -331,7 +301,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getAcceptorDef_ExecutorService()
@@ -341,7 +310,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getAcceptorDef_Negotiator()
@@ -351,7 +319,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getAcceptorDef_ServerProtocolProvider()
@@ -361,7 +328,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getTCPAcceptorDef()
@@ -371,7 +337,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getTCPAcceptorDef_Host()
@@ -381,7 +346,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getTCPAcceptorDef_Port()
@@ -391,7 +355,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getTCPAcceptorDef_TcpSelectorDef()
@@ -401,7 +364,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getJVMAcceptorDef()
@@ -411,7 +373,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getJVMAcceptorDef_Name()
@@ -421,7 +382,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getJVMConnectorDef()
@@ -431,7 +391,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getJVMConnectorDef_Name()
@@ -441,7 +400,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getHTTPConnectorDef()
@@ -451,7 +409,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getHTTPConnectorDef_Url()
@@ -461,7 +418,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getTCPSelectorDef()
@@ -471,7 +427,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getServerProtocolFactoryDef()
@@ -481,7 +436,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getBufferProviderDef()
@@ -491,7 +445,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getBufferPoolDef()
@@ -501,7 +454,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getProtocolProviderDef()
@@ -511,7 +463,6 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Net4jDefsFactory getNet4jDefsFactory()
@@ -521,23 +472,20 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private boolean isCreated = false;
 
   /**
-   * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
-   * first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates the meta-model objects for the package.  This method is
+   * guarded to have no affect on any invocation but its first.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public void createPackageContents()
   {
     if (isCreated)
-    {
       return;
-    }
     isCreated = true;
 
     // Create classes and their features
@@ -588,23 +536,20 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private boolean isInitialized = false;
 
   /**
-   * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
-   * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Complete the initialization of the package and its meta-model.  This
+   * method is guarded to have no affect on any invocation but its first.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public void initializePackageContents()
   {
     if (isInitialized)
-    {
       return;
-    }
     isInitialized = true;
 
     // Initialize package
@@ -622,17 +567,17 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
     // Add supertypes to classes
     connectorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    clientProtocolFactoryDefEClass.getESuperTypes().add(getProtocolProviderDef());
-    tcpConnectorDefEClass.getESuperTypes().add(getConnectorDef());
+    clientProtocolFactoryDefEClass.getESuperTypes().add(this.getProtocolProviderDef());
+    tcpConnectorDefEClass.getESuperTypes().add(this.getConnectorDef());
     acceptorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    tcpAcceptorDefEClass.getESuperTypes().add(getAcceptorDef());
-    jvmAcceptorDefEClass.getESuperTypes().add(getAcceptorDef());
-    jvmConnectorDefEClass.getESuperTypes().add(getConnectorDef());
-    httpConnectorDefEClass.getESuperTypes().add(getConnectorDef());
+    tcpAcceptorDefEClass.getESuperTypes().add(this.getAcceptorDef());
+    jvmAcceptorDefEClass.getESuperTypes().add(this.getAcceptorDef());
+    jvmConnectorDefEClass.getESuperTypes().add(this.getConnectorDef());
+    httpConnectorDefEClass.getESuperTypes().add(this.getConnectorDef());
     tcpSelectorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    serverProtocolFactoryDefEClass.getESuperTypes().add(getProtocolProviderDef());
+    serverProtocolFactoryDefEClass.getESuperTypes().add(this.getProtocolProviderDef());
     bufferProviderDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    bufferPoolDefEClass.getESuperTypes().add(getBufferProviderDef());
+    bufferPoolDefEClass.getESuperTypes().add(this.getBufferProviderDef());
     protocolProviderDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
 
     // Initialize classes and features; add operations and parameters
@@ -640,7 +585,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(), getBufferProviderDef(), null, "bufferProvider", null, 1, 1,
+    initEReference(getConnectorDef_BufferProvider(), this.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,
@@ -649,7 +594,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(), getClientProtocolFactoryDef(), null,
+    initEReference(getConnectorDef_ClientProtocolProvider(), this.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);
 
@@ -658,7 +603,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
     initEClass(tcpConnectorDefEClass, TCPConnectorDef.class, "TCPConnectorDef", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTCPConnectorDef_TcpSelectorDef(), getTCPSelectorDef(), null, "tcpSelectorDef", null, 0, 1,
+    initEReference(getTCPConnectorDef_TcpSelectorDef(), this.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,
@@ -668,7 +613,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
     initEClass(acceptorDefEClass, AcceptorDef.class, "AcceptorDef", IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getAcceptorDef_BufferProvider(), getBufferPoolDef(), null, "bufferProvider", null, 0, 1,
+    initEReference(getAcceptorDef_BufferProvider(), this.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,
@@ -677,7 +622,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
     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(), getServerProtocolFactoryDef(), null,
+    initEReference(getAcceptorDef_ServerProtocolProvider(), this.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);
 
@@ -687,7 +632,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(), getTCPSelectorDef(), null, "tcpSelectorDef", null, 1, 1,
+    initEReference(getTCPAcceptorDef_TcpSelectorDef(), this.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 fadc6340f4..d8b68c89c4 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
@@ -22,14 +22,13 @@ import org.eclipse.emf.ecore.EClass;
  * end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class ProtocolProviderDefImpl extends DefImpl implements ProtocolProviderDef
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected ProtocolProviderDefImpl()
@@ -39,7 +38,6 @@ public abstract class ProtocolProviderDefImpl extends DefImpl implements Protoco
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
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 658ca41832..42f0cc3f57 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
@@ -21,14 +21,13 @@ import org.eclipse.emf.ecore.EClass;
  * end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class ServerProtocolFactoryDefImpl extends ProtocolProviderDefImpl implements ServerProtocolFactoryDef
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected ServerProtocolFactoryDefImpl()
@@ -38,7 +37,6 @@ public abstract class ServerProtocolFactoryDefImpl extends ProtocolProviderDefIm
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
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 f012c976a5..6a6161d4ba 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
@@ -51,8 +51,8 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
   protected static final String HOST_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getHost() <em>Host</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The cached value of the '{@link #getHost() <em>Host</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #getHost()
    * @generated
    * @ordered
@@ -70,8 +70,8 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
   protected static final int PORT_EDEFAULT = 0;
 
   /**
-   * The cached value of the '{@link #getPort() <em>Port</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The cached value of the '{@link #getPort() <em>Port</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #getPort()
    * @generated
    * @ordered
@@ -79,9 +79,9 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
   protected int port = PORT_EDEFAULT;
 
   /**
-   * The cached value of the '{@link #getTcpSelectorDef() <em>Tcp Selector Def</em>}' reference. <!-- begin-user-doc -->
+   * The cached value of the '{@link #getTcpSelectorDef() <em>Tcp Selector Def</em>}' reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @see #getTcpSelectorDef()
    * @generated
    * @ordered
@@ -90,7 +90,6 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected TCPAcceptorDefImpl()
@@ -100,7 +99,6 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -111,7 +109,6 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getHost()
@@ -121,7 +118,6 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setHost(String newHost)
@@ -129,14 +125,11 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public int getPort()
@@ -146,7 +139,6 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setPort(int newPort)
@@ -154,14 +146,11 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public TCPSelectorDef getTcpSelectorDef()
@@ -173,10 +162,8 @@ 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));
-        }
       }
     }
     return tcpSelectorDef;
@@ -184,7 +171,6 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public TCPSelectorDef basicGetTcpSelectorDef()
@@ -194,7 +180,6 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setTcpSelectorDef(TCPSelectorDef newTcpSelectorDef)
@@ -202,15 +187,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -224,9 +206,7 @@ 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);
@@ -234,7 +214,6 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -257,7 +236,6 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -280,7 +258,6 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -300,16 +277,13 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
   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 0c34a926e2..e26ec02c60 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
@@ -41,9 +41,9 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnectorDef
 {
   /**
-   * The cached value of the '{@link #getTcpSelectorDef() <em>Tcp Selector Def</em>}' reference. <!-- begin-user-doc -->
+   * The cached value of the '{@link #getTcpSelectorDef() <em>Tcp Selector Def</em>}' reference.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @see #getTcpSelectorDef()
    * @generated
    * @ordered
@@ -61,8 +61,8 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
   protected static final String HOST_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getHost() <em>Host</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The cached value of the '{@link #getHost() <em>Host</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #getHost()
    * @generated
    * @ordered
@@ -80,8 +80,8 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
   protected static final int PORT_EDEFAULT = 0;
 
   /**
-   * The cached value of the '{@link #getPort() <em>Port</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The cached value of the '{@link #getPort() <em>Port</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #getPort()
    * @generated
    * @ordered
@@ -89,8 +89,8 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
   protected int port = PORT_EDEFAULT;
 
   /**
-   * This is true if the Port attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This is true if the Port attribute has been set.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -98,7 +98,6 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected TCPConnectorDefImpl()
@@ -108,7 +107,6 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -119,7 +117,6 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public TCPSelectorDef getTcpSelectorDef()
@@ -131,10 +128,8 @@ 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;
@@ -142,7 +137,6 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public TCPSelectorDef basicGetTcpSelectorDef()
@@ -152,7 +146,6 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setTcpSelectorDef(TCPSelectorDef newTcpSelectorDef)
@@ -160,15 +153,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getHost()
@@ -178,7 +168,6 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setHost(String newHost)
@@ -186,9 +175,7 @@ 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));
-    }
   }
 
   /**
@@ -219,7 +206,6 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setPort(int newPort)
@@ -229,15 +215,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void unsetPort()
@@ -247,15 +230,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public boolean isSetPort()
@@ -265,7 +245,6 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -275,9 +254,7 @@ 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();
@@ -289,7 +266,6 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -312,7 +288,6 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -335,7 +310,6 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -355,29 +329,22 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
   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 4830c8e60c..5764723ab7 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
@@ -22,7 +22,6 @@ public class TCPSelectorDefImpl extends DefImpl implements TCPSelectorDef
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected TCPSelectorDefImpl()
@@ -32,7 +31,6 @@ public class TCPSelectorDefImpl extends DefImpl implements TCPSelectorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
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 2d91141c16..a5f7a50ab9 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
@@ -35,22 +35,21 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
  * method for each class of the model. <!-- end-user-doc -->
- * 
  * @see org.eclipse.net4j.defs.Net4jDefsPackage
  * @generated
  */
 public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
 {
   /**
-   * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The cached model package.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected static Net4jDefsPackage modelPackage;
 
   /**
-   * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates an instance of the adapter factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public Net4jDefsAdapterFactory()
@@ -62,10 +61,10 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
+   * Returns whether this factory is applicable for the type of the object.
+   * <!-- begin-user-doc --> This implementation
    * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
    * end-user-doc -->
-   * 
    * @return whether this factory is applicable for the type of the object.
    * @generated
    */
@@ -84,8 +83,8 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The switch that delegates to the <code>createXXX</code> methods.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected Net4jDefsSwitch<Adapter> modelSwitch = new Net4jDefsSwitch<Adapter>()
@@ -182,10 +181,9 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   };
 
   /**
-   * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param target
-   *          the object to adapt.
+   * Creates an adapter for the <code>target</code>.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param target the object to adapt.
    * @return the adapter for the <code>target</code>.
    * @generated
    */
@@ -199,7 +197,6 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ConnectorDef <em>Connector 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.defs.ConnectorDef
    * @generated
@@ -210,11 +207,10 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ClientProtocolFactoryDef
-   * <em>Client Protocol Factory Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ClientProtocolFactoryDef <em>Client Protocol Factory 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.defs.ClientProtocolFactoryDef
    * @generated
@@ -225,11 +221,10 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.TCPConnectorDef
-   * <em>TCP Connector Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.TCPConnectorDef <em>TCP Connector 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.defs.TCPConnectorDef
    * @generated
@@ -243,7 +238,6 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.AcceptorDef <em>Acceptor 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.defs.AcceptorDef
    * @generated
@@ -254,10 +248,9 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.TCPAcceptorDef
-   * <em>TCP Acceptor Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.TCPAcceptorDef <em>TCP Acceptor 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.defs.TCPAcceptorDef
    * @generated
@@ -268,10 +261,9 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.JVMAcceptorDef
-   * <em>JVM Acceptor Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.JVMAcceptorDef <em>JVM Acceptor 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.defs.JVMAcceptorDef
    * @generated
@@ -282,11 +274,10 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.JVMConnectorDef
-   * <em>JVM Connector Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.JVMConnectorDef <em>JVM Connector 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.defs.JVMConnectorDef
    * @generated
@@ -297,11 +288,10 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.HTTPConnectorDef
-   * <em>HTTP Connector Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.HTTPConnectorDef <em>HTTP Connector 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.defs.HTTPConnectorDef
    * @generated
@@ -312,10 +302,9 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.TCPSelectorDef
-   * <em>TCP Selector Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.TCPSelectorDef <em>TCP Selector 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.defs.TCPSelectorDef
    * @generated
@@ -326,11 +315,10 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ServerProtocolFactoryDef
-   * <em>Server Protocol Factory Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ServerProtocolFactoryDef <em>Server Protocol Factory 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.defs.ServerProtocolFactoryDef
    * @generated
@@ -341,11 +329,10 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.BufferProviderDef
-   * <em>Buffer Provider Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.BufferProviderDef <em>Buffer Provider 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.defs.BufferProviderDef
    * @generated
@@ -356,10 +343,9 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.BufferPoolDef <em>Buffer Pool Def</em>}
-   * '. <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.BufferPoolDef <em>Buffer Pool 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.defs.BufferPoolDef
    * @generated
@@ -370,11 +356,10 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ProtocolProviderDef
-   * <em>Protocol Provider Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.defs.ProtocolProviderDef <em>Protocol Provider 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.defs.ProtocolProviderDef
    * @generated
@@ -399,9 +384,9 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
+   * Creates a new adapter for the default case.
+   * <!-- begin-user-doc --> This default implementation returns null. <!--
    * end-user-doc -->
-   * 
    * @return the new adapter.
    * @generated
    */
diff --git a/plugins/org.eclipse.net4j.ui.defs/model/org.eclipse.net4j.ui.defs.genmodel b/plugins/org.eclipse.net4j.ui.defs/model/org.eclipse.net4j.ui.defs.genmodel
index ef6eb1d967..e8c2464b8a 100644
--- a/plugins/org.eclipse.net4j.ui.defs/model/org.eclipse.net4j.ui.defs.genmodel
+++ b/plugins/org.eclipse.net4j.ui.defs/model/org.eclipse.net4j.ui.defs.genmodel
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&#xA; * All rights reserved. This program and the accompanying materials&#xA; * are made available under the terms of the Eclipse Public License v1.0&#xA; * which accompanies this distribution, and is available at&#xA; * http://www.eclipse.org/legal/epl-v10.html&#xA; * &#xA; * Contributors:&#xA; *    Andre Dietisheim - initial API and implementation"
-    modelDirectory="/org.eclipse.net4j.ui.defs/src" editDirectory="" editorDirectory=""
-    modelPluginID="org.eclipse.net4j.ui.defs" modelName="Org.eclipse.net4j.ui" codeFormatting="true"
-    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
-    copyrightFields="false" usedGenPackages="../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel#//defs">
-  <foreignModel>org.eclipse.net4j.ui.defs.ecore</foreignModel>
-  <genPackages prefix="Net4JUIDefs" basePackage="org.eclipse.net4j.ui" disposableProviderFactory="true"
-      ecorePackage="org.eclipse.net4j.ui.defs.ecore#/">
-    <genClasses ecoreClass="org.eclipse.net4j.ui.defs.ecore#//InteractiveCredentialsProviderDef"/>
-  </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&#xA; * All rights reserved. This program and the accompanying materials&#xA; * are made available under the terms of the Eclipse Public License v1.0&#xA; * which accompanies this distribution, and is available at&#xA; * http://www.eclipse.org/legal/epl-v10.html&#xA; * &#xA; * Contributors:&#xA; *    Andre Dietisheim - initial API and implementation"
+    modelDirectory="/org.eclipse.net4j.ui.defs/src" editDirectory="" editorDirectory=""
+    modelPluginID="org.eclipse.net4j.ui.defs" modelName="Org.eclipse.net4j.ui" codeFormatting="true"
+    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
+    copyrightFields="false" runtimeVersion="2.6" usedGenPackages="../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel#//defs">
+  <foreignModel>org.eclipse.net4j.ui.defs.ecore</foreignModel>
+  <genPackages prefix="Net4JUIDefs" basePackage="org.eclipse.net4j.ui" disposableProviderFactory="true"
+      ecorePackage="org.eclipse.net4j.ui.defs.ecore#/">
+    <genClasses ecoreClass="org.eclipse.net4j.ui.defs.ecore#//InteractiveCredentialsProviderDef"/>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/InteractiveCredentialsProviderDef.java b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/InteractiveCredentialsProviderDef.java
index b14ba2f1e5..3f4ce35142 100644
--- a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/InteractiveCredentialsProviderDef.java
+++ b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/InteractiveCredentialsProviderDef.java
@@ -16,7 +16,8 @@ import org.eclipse.net4j.util.defs.Def;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Interactive Credentials Provider Def</b></em>'.
  * <!-- end-user-doc -->
- * 
+ *
+ *
  * @see org.eclipse.net4j.ui.defs.Net4JUIDefsPackage#getInteractiveCredentialsProviderDef()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/Net4JUIDefsFactory.java b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/Net4JUIDefsFactory.java
index ece577521d..e4113259df 100644
--- a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/Net4JUIDefsFactory.java
+++ b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/Net4JUIDefsFactory.java
@@ -16,31 +16,30 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
  * the model. <!-- end-user-doc -->
- * 
  * @see org.eclipse.net4j.ui.defs.Net4JUIDefsPackage
  * @generated
  */
 public interface Net4JUIDefsFactory extends EFactory
 {
   /**
-   * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The singleton instance of the factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   Net4JUIDefsFactory eINSTANCE = org.eclipse.net4j.ui.defs.impl.Net4JUIDefsFactoryImpl.init();
 
   /**
-   * Returns a new object of class '<em>Interactive Credentials Provider Def</em>'. <!-- begin-user-doc --> <!--
+   * Returns a new object of class '<em>Interactive Credentials Provider Def</em>'.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @return a new object of class '<em>Interactive Credentials Provider Def</em>'.
    * @generated
    */
   InteractiveCredentialsProviderDef createInteractiveCredentialsProviderDef();
 
   /**
-   * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the package supported by this factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the package supported by this factory.
    * @generated
    */
diff --git a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/Net4JUIDefsPackage.java b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/Net4JUIDefsPackage.java
index 5f6a95ee6a..0b528487d7 100644
--- a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/Net4JUIDefsPackage.java
+++ b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/Net4JUIDefsPackage.java
@@ -25,7 +25,6 @@ import org.eclipse.emf.ecore.EPackage;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * 
  * @see org.eclipse.net4j.ui.defs.Net4JUIDefsFactory
  * @model kind="package"
  * @generated
@@ -33,37 +32,36 @@ import org.eclipse.emf.ecore.EPackage;
 public interface Net4JUIDefsPackage extends EPackage
 {
   /**
-   * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The package name.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   String eNAME = "defs"; //$NON-NLS-1$
 
   /**
-   * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The package namespace URI.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   String eNS_URI = "http://www.eclipse.org/NET4J/ui/defs/1.0.0"; //$NON-NLS-1$
 
   /**
-   * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The package namespace name.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   String eNS_PREFIX = "net4j.ui.defs"; //$NON-NLS-1$
 
   /**
-   * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The singleton instance of the package.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   Net4JUIDefsPackage eINSTANCE = org.eclipse.net4j.ui.defs.impl.Net4JUIDefsPackageImpl.init();
 
   /**
-   * The meta object id for the '{@link org.eclipse.net4j.ui.defs.impl.InteractiveCredentialsProviderDefImpl
-   * <em>Interactive Credentials Provider Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.net4j.ui.defs.impl.InteractiveCredentialsProviderDefImpl <em>Interactive Credentials Provider Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.net4j.ui.defs.impl.InteractiveCredentialsProviderDefImpl
    * @see org.eclipse.net4j.ui.defs.impl.Net4JUIDefsPackageImpl#getInteractiveCredentialsProviderDef()
    * @generated
@@ -71,18 +69,17 @@ public interface Net4JUIDefsPackage extends EPackage
   int INTERACTIVE_CREDENTIALS_PROVIDER_DEF = 0;
 
   /**
-   * The number of structural features of the '<em>Interactive Credentials Provider Def</em>' class. <!-- begin-user-doc
+   * The number of structural features of the '<em>Interactive Credentials Provider Def</em>' class.
+   * <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int INTERACTIVE_CREDENTIALS_PROVIDER_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.ui.defs.InteractiveCredentialsProviderDef
-   * <em>Interactive Credentials Provider Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.net4j.ui.defs.InteractiveCredentialsProviderDef <em>Interactive Credentials Provider Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Interactive Credentials Provider Def</em>'.
    * @see org.eclipse.net4j.ui.defs.InteractiveCredentialsProviderDef
    * @generated
@@ -90,8 +87,8 @@ public interface Net4JUIDefsPackage extends EPackage
   EClass getInteractiveCredentialsProviderDef();
 
   /**
-   * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the factory that creates the instances of the model.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the factory that creates the instances of the model.
    * @generated
    */
@@ -106,15 +103,13 @@ public interface Net4JUIDefsPackage extends EPackage
    * <li>and each data type</li>
    * </ul>
    * <!-- end-user-doc -->
-   * 
    * @generated
    */
   interface Literals
   {
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.ui.defs.impl.InteractiveCredentialsProviderDefImpl
-     * <em>Interactive Credentials Provider Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.net4j.ui.defs.impl.InteractiveCredentialsProviderDefImpl <em>Interactive Credentials Provider Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.net4j.ui.defs.impl.InteractiveCredentialsProviderDefImpl
      * @see org.eclipse.net4j.ui.defs.impl.Net4JUIDefsPackageImpl#getInteractiveCredentialsProviderDef()
      * @generated
diff --git a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/InteractiveCredentialsProviderDefImpl.java b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/InteractiveCredentialsProviderDefImpl.java
index 0dd99a3a1a..5484ed00c4 100644
--- a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/InteractiveCredentialsProviderDefImpl.java
+++ b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/InteractiveCredentialsProviderDefImpl.java
@@ -23,14 +23,13 @@ import org.eclipse.emf.ecore.EClass;
  * '. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class InteractiveCredentialsProviderDefImpl extends DefImpl implements InteractiveCredentialsProviderDef
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected InteractiveCredentialsProviderDefImpl()
@@ -40,7 +39,6 @@ public class InteractiveCredentialsProviderDefImpl extends DefImpl implements In
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsFactoryImpl.java b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsFactoryImpl.java
index 7cd35ff31c..c4a46f5c5a 100644
--- a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsFactoryImpl.java
+++ b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsFactoryImpl.java
@@ -23,14 +23,13 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- * 
  * @generated
  */
 public class Net4JUIDefsFactoryImpl extends EFactoryImpl implements Net4JUIDefsFactory
 {
   /**
-   * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates the default factory implementation.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public static Net4JUIDefsFactory init()
@@ -52,8 +51,8 @@ public class Net4JUIDefsFactoryImpl extends EFactoryImpl implements Net4JUIDefsF
   }
 
   /**
-   * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates an instance of the factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public Net4JUIDefsFactoryImpl()
@@ -63,7 +62,6 @@ public class Net4JUIDefsFactoryImpl extends EFactoryImpl implements Net4JUIDefsF
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -80,7 +78,6 @@ public class Net4JUIDefsFactoryImpl extends EFactoryImpl implements Net4JUIDefsF
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public InteractiveCredentialsProviderDef createInteractiveCredentialsProviderDef()
@@ -91,7 +88,6 @@ public class Net4JUIDefsFactoryImpl extends EFactoryImpl implements Net4JUIDefsF
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Net4JUIDefsPackage getNet4JUIDefsPackage()
@@ -101,7 +97,6 @@ public class Net4JUIDefsFactoryImpl extends EFactoryImpl implements Net4JUIDefsF
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsPackageImpl.java b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsPackageImpl.java
index 4a2d09eb80..8c40be350d 100644
--- a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsPackageImpl.java
+++ b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsPackageImpl.java
@@ -22,14 +22,12 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- * 
  * @generated
  */
 public class Net4JUIDefsPackageImpl extends EPackageImpl implements Net4JUIDefsPackage
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass interactiveCredentialsProviderDefEClass = null;
@@ -54,18 +52,17 @@ public class Net4JUIDefsPackageImpl extends EPackageImpl implements Net4JUIDefsP
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private static boolean isInited = false;
 
   /**
    * 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 Net4JUIDefsPackage#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
-   * --> <!-- end-user-doc -->
    * 
+   * <p>This method is used to initialize {@link Net4JUIDefsPackage#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
+   * --> <!-- end-user-doc -->
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -74,9 +71,7 @@ public class Net4JUIDefsPackageImpl extends EPackageImpl implements Net4JUIDefsP
   public static Net4JUIDefsPackage init()
   {
     if (isInited)
-    {
       return (Net4JUIDefsPackage)EPackage.Registry.INSTANCE.getEPackage(Net4JUIDefsPackage.eNS_URI);
-    }
 
     // Obtain or create and register package
     Net4JUIDefsPackageImpl theNet4JUIDefsPackage = (Net4JUIDefsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Net4JUIDefsPackageImpl ? EPackage.Registry.INSTANCE
@@ -103,7 +98,6 @@ public class Net4JUIDefsPackageImpl extends EPackageImpl implements Net4JUIDefsP
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getInteractiveCredentialsProviderDef()
@@ -113,7 +107,6 @@ public class Net4JUIDefsPackageImpl extends EPackageImpl implements Net4JUIDefsP
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Net4JUIDefsFactory getNet4JUIDefsFactory()
@@ -123,23 +116,20 @@ public class Net4JUIDefsPackageImpl extends EPackageImpl implements Net4JUIDefsP
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private boolean isCreated = false;
 
   /**
-   * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
-   * first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates the meta-model objects for the package.  This method is
+   * guarded to have no affect on any invocation but its first.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public void createPackageContents()
   {
     if (isCreated)
-    {
       return;
-    }
     isCreated = true;
 
     // Create classes and their features
@@ -148,23 +138,20 @@ public class Net4JUIDefsPackageImpl extends EPackageImpl implements Net4JUIDefsP
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private boolean isInitialized = false;
 
   /**
-   * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
-   * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Complete the initialization of the package and its meta-model.  This
+   * method is guarded to have no affect on any invocation but its first.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public void initializePackageContents()
   {
     if (isInitialized)
-    {
       return;
-    }
     isInitialized = true;
 
     // Initialize package
diff --git a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/util/Net4JUIDefsAdapterFactory.java b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/util/Net4JUIDefsAdapterFactory.java
index cf5dacc2cd..5a0461900d 100644
--- a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/util/Net4JUIDefsAdapterFactory.java
+++ b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/util/Net4JUIDefsAdapterFactory.java
@@ -23,22 +23,21 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
  * method for each class of the model. <!-- end-user-doc -->
- * 
  * @see org.eclipse.net4j.ui.defs.Net4JUIDefsPackage
  * @generated
  */
 public class Net4JUIDefsAdapterFactory extends AdapterFactoryImpl
 {
   /**
-   * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The cached model package.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected static Net4JUIDefsPackage modelPackage;
 
   /**
-   * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates an instance of the adapter factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public Net4JUIDefsAdapterFactory()
@@ -50,10 +49,10 @@ public class Net4JUIDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
+   * Returns whether this factory is applicable for the type of the object.
+   * <!-- begin-user-doc --> This implementation
    * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
    * end-user-doc -->
-   * 
    * @return whether this factory is applicable for the type of the object.
    * @generated
    */
@@ -72,8 +71,8 @@ public class Net4JUIDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The switch that delegates to the <code>createXXX</code> methods.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected Net4JUIDefsSwitch<Adapter> modelSwitch = new Net4JUIDefsSwitch<Adapter>()
@@ -98,10 +97,9 @@ public class Net4JUIDefsAdapterFactory extends AdapterFactoryImpl
   };
 
   /**
-   * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param target
-   *          the object to adapt.
+   * Creates an adapter for the <code>target</code>.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param target the object to adapt.
    * @return the adapter for the <code>target</code>.
    * @generated
    */
@@ -112,11 +110,10 @@ public class Net4JUIDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.ui.defs.InteractiveCredentialsProviderDef
-   * <em>Interactive Credentials Provider Def</em>}'. <!-- begin-user-doc --> This default implementation returns null
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.ui.defs.InteractiveCredentialsProviderDef <em>Interactive Credentials Provider 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.ui.defs.InteractiveCredentialsProviderDef
    * @generated
@@ -141,9 +138,9 @@ public class Net4JUIDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
+   * Creates a new adapter for the default case.
+   * <!-- begin-user-doc --> This default implementation returns null. <!--
    * end-user-doc -->
-   * 
    * @return the new adapter.
    * @generated
    */
diff --git a/plugins/org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel b/plugins/org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel
index 7944621407..217c427530 100644
--- a/plugins/org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel
+++ b/plugins/org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&#xA; * All rights reserved. This program and the accompanying materials&#xA; * are made available under the terms of the Eclipse Public License v1.0&#xA; * which accompanies this distribution, and is available at&#xA; * http://www.eclipse.org/legal/epl-v10.html&#xA; * &#xA; * Contributors:&#xA; *    Andre Dietisheim - initial API and implementation"
-    modelDirectory="/org.eclipse.net4j.util.defs/src" editDirectory="" editorDirectory=""
-    modelPluginID="org.eclipse.net4j.util.defs" modelName="Org.eclipse.net4j.util"
-    codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false" language="en">
-  <foreignModel>org.eclipse.net4j.util.defs.ecore</foreignModel>
-  <genPackages prefix="Net4jUtilDefs" basePackage="org.eclipse.net4j.util" disposableProviderFactory="true"
-      ecorePackage="org.eclipse.net4j.util.defs.ecore#/">
-    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//DefContainer">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.net4j.util.defs.ecore#//DefContainer/definitions"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.util.defs.ecore#//DefContainer/defaultDefinition"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="org.eclipse.net4j.util.defs.ecore#//Def">
-      <genOperations ecoreOperation="org.eclipse.net4j.util.defs.ecore#//Def/getInstance"/>
-      <genOperations ecoreOperation="org.eclipse.net4j.util.defs.ecore#//Def/unsetInstance"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//ExecutorServiceDef"/>
-    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//ThreadPoolDef"/>
-    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//RandomizerDef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.util.defs.ecore#//RandomizerDef/algorithmName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.util.defs.ecore#//RandomizerDef/providerName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.util.defs.ecore#//RandomizerDef/seed"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//UserManagerDef">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.util.defs.ecore#//UserManagerDef/user"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//User">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.util.defs.ecore#//User/userID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.util.defs.ecore#//User/password"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//PasswordCredentialsProviderDef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.util.defs.ecore#//PasswordCredentialsProviderDef/password"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="org.eclipse.net4j.util.defs.ecore#//CredentialsProviderDef">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.util.defs.ecore#//CredentialsProviderDef/userID"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="org.eclipse.net4j.util.defs.ecore#//NegotiatorDef"/>
-    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//ResponseNegotiatorDef">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.util.defs.ecore#//ResponseNegotiatorDef/credentialsProvider"/>
-    </genClasses>
-    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//ChallengeNegotiatorDef">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.util.defs.ecore#//ChallengeNegotiatorDef/userManager"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.util.defs.ecore#//ChallengeNegotiatorDef/randomizer"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&#xA; * All rights reserved. This program and the accompanying materials&#xA; * are made available under the terms of the Eclipse Public License v1.0&#xA; * which accompanies this distribution, and is available at&#xA; * http://www.eclipse.org/legal/epl-v10.html&#xA; * &#xA; * Contributors:&#xA; *    Andre Dietisheim - initial API and implementation"
+    modelDirectory="/org.eclipse.net4j.util.defs/src" editDirectory="" editorDirectory=""
+    modelPluginID="org.eclipse.net4j.util.defs" modelName="Org.eclipse.net4j.util"
+    codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
+    complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.6" language="en">
+  <foreignModel>org.eclipse.net4j.util.defs.ecore</foreignModel>
+  <genPackages prefix="Net4jUtilDefs" basePackage="org.eclipse.net4j.util" disposableProviderFactory="true"
+      ecorePackage="org.eclipse.net4j.util.defs.ecore#/">
+    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//DefContainer">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.net4j.util.defs.ecore#//DefContainer/definitions"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.util.defs.ecore#//DefContainer/defaultDefinition"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="org.eclipse.net4j.util.defs.ecore#//Def">
+      <genOperations ecoreOperation="org.eclipse.net4j.util.defs.ecore#//Def/getInstance"/>
+      <genOperations ecoreOperation="org.eclipse.net4j.util.defs.ecore#//Def/unsetInstance"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//ExecutorServiceDef"/>
+    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//ThreadPoolDef"/>
+    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//RandomizerDef">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.util.defs.ecore#//RandomizerDef/algorithmName"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.util.defs.ecore#//RandomizerDef/providerName"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.util.defs.ecore#//RandomizerDef/seed"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//UserManagerDef">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.util.defs.ecore#//UserManagerDef/user"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//User">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.util.defs.ecore#//User/userID"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.util.defs.ecore#//User/password"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//PasswordCredentialsProviderDef">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.util.defs.ecore#//PasswordCredentialsProviderDef/password"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="org.eclipse.net4j.util.defs.ecore#//CredentialsProviderDef">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.net4j.util.defs.ecore#//CredentialsProviderDef/userID"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="org.eclipse.net4j.util.defs.ecore#//NegotiatorDef"/>
+    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//ResponseNegotiatorDef">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.util.defs.ecore#//ResponseNegotiatorDef/credentialsProvider"/>
+    </genClasses>
+    <genClasses ecoreClass="org.eclipse.net4j.util.defs.ecore#//ChallengeNegotiatorDef">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.util.defs.ecore#//ChallengeNegotiatorDef/userManager"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference org.eclipse.net4j.util.defs.ecore#//ChallengeNegotiatorDef/randomizer"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ChallengeNegotiatorDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ChallengeNegotiatorDef.java
index 0b2ad1a590..7df7d63468 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ChallengeNegotiatorDef.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ChallengeNegotiatorDef.java
@@ -14,14 +14,15 @@ package org.eclipse.net4j.util.defs;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Challenge Negotiator Def</b></em>'. <!--
  * end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.net4j.util.defs.ChallengeNegotiatorDef#getUserManager <em>User Manager</em>}</li>
- * <li>{@link org.eclipse.net4j.util.defs.ChallengeNegotiatorDef#getRandomizer <em>Randomizer</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.ChallengeNegotiatorDef#getUserManager <em>User Manager</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.ChallengeNegotiatorDef#getRandomizer <em>Randomizer</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getChallengeNegotiatorDef()
  * @model
  * @generated
@@ -29,13 +30,13 @@ package org.eclipse.net4j.util.defs;
 public interface ChallengeNegotiatorDef extends NegotiatorDef
 {
   /**
-   * Returns the value of the '<em><b>User Manager</b></em>' reference. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>User Manager</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>User Manager</em>' reference isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>User Manager</em>' reference.
    * @see #setUserManager(UserManagerDef)
    * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getChallengeNegotiatorDef_UserManager()
@@ -45,24 +46,22 @@ public interface ChallengeNegotiatorDef extends NegotiatorDef
   UserManagerDef getUserManager();
 
   /**
-   * Sets the value of the '{@link org.eclipse.net4j.util.defs.ChallengeNegotiatorDef#getUserManager
-   * <em>User Manager</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>User Manager</em>' reference.
+   * Sets the value of the '{@link org.eclipse.net4j.util.defs.ChallengeNegotiatorDef#getUserManager <em>User Manager</em>}' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>User Manager</em>' reference.
    * @see #getUserManager()
    * @generated
    */
   void setUserManager(UserManagerDef value);
 
   /**
-   * Returns the value of the '<em><b>Randomizer</b></em>' reference. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Randomizer</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Randomizer</em>' reference isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Randomizer</em>' reference.
    * @see #setRandomizer(RandomizerDef)
    * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getChallengeNegotiatorDef_Randomizer()
@@ -72,11 +71,9 @@ public interface ChallengeNegotiatorDef extends NegotiatorDef
   RandomizerDef getRandomizer();
 
   /**
-   * Sets the value of the '{@link org.eclipse.net4j.util.defs.ChallengeNegotiatorDef#getRandomizer <em>Randomizer</em>}
-   * ' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Randomizer</em>' reference.
+   * Sets the value of the '{@link org.eclipse.net4j.util.defs.ChallengeNegotiatorDef#getRandomizer <em>Randomizer</em>}' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>Randomizer</em>' reference.
    * @see #getRandomizer()
    * @generated
    */
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/CredentialsProviderDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/CredentialsProviderDef.java
index 287c773c00..a2c08e0e15 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/CredentialsProviderDef.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/CredentialsProviderDef.java
@@ -14,13 +14,14 @@ package org.eclipse.net4j.util.defs;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Credentials Provider Def</b></em>'. <!--
  * end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.net4j.util.defs.CredentialsProviderDef#getUserID <em>User ID</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.CredentialsProviderDef#getUserID <em>User ID</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getCredentialsProviderDef()
  * @model abstract="true"
  * @generated
@@ -28,13 +29,13 @@ package org.eclipse.net4j.util.defs;
 public interface CredentialsProviderDef extends Def
 {
   /**
-   * Returns the value of the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>User ID</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>User ID</em>' attribute isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>User ID</em>' attribute.
    * @see #setUserID(String)
    * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getCredentialsProviderDef_UserID()
@@ -44,11 +45,9 @@ public interface CredentialsProviderDef extends Def
   String getUserID();
 
   /**
-   * Sets the value of the '{@link org.eclipse.net4j.util.defs.CredentialsProviderDef#getUserID <em>User ID</em>}'
-   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>User ID</em>' attribute.
+   * Sets the value of the '{@link org.eclipse.net4j.util.defs.CredentialsProviderDef#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 #getUserID()
    * @generated
    */
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Def.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Def.java
index dbb3972727..ca683e5410 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Def.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Def.java
@@ -15,7 +15,8 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Def</b></em>'. <!-- end-user-doc -->
- * 
+ *
+ *
  * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getDef()
  * @model abstract="true"
  * @generated
@@ -24,7 +25,6 @@ public interface Def extends EObject
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @model kind="operation"
    * @generated
    */
@@ -32,7 +32,6 @@ public interface Def extends EObject
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @model
    * @generated
    */
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/DefContainer.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/DefContainer.java
index 0b0fda3a98..6397ec1169 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/DefContainer.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/DefContainer.java
@@ -16,14 +16,15 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Defs Container</b></em>'. <!-- end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.net4j.util.defs.DefContainer#getDefinitions <em>Definitions</em>}</li>
- * <li>{@link org.eclipse.net4j.util.defs.DefContainer#getDefaultDefinition <em>Default Definition</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.DefContainer#getDefinitions <em>Definitions</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.DefContainer#getDefaultDefinition <em>Default Definition</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getDefContainer()
  * @model
  * @generated
@@ -31,14 +32,14 @@ import org.eclipse.emf.ecore.EObject;
 public interface DefContainer extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Definitions</b></em>' containment reference list. The list contents are of type
-   * {@link org.eclipse.net4j.util.defs.Def}. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Definitions</b></em>' containment reference list.
+   * The list contents are of type {@link org.eclipse.net4j.util.defs.Def}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Definitions</em>' containment reference list isn't clear, there really should be more of
    * a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Definitions</em>' containment reference list.
    * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getDefContainer_Definitions()
    * @model containment="true" required="true"
@@ -47,13 +48,13 @@ public interface DefContainer extends EObject
   EList<Def> getDefinitions();
 
   /**
-   * Returns the value of the '<em><b>Default Definition</b></em>' reference. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Default Definition</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Default Definition</em>' reference isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Default Definition</em>' reference.
    * @see #setDefaultDefinition(Def)
    * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getDefContainer_DefaultDefinition()
@@ -63,11 +64,9 @@ public interface DefContainer extends EObject
   Def getDefaultDefinition();
 
   /**
-   * Sets the value of the '{@link org.eclipse.net4j.util.defs.DefContainer#getDefaultDefinition
-   * <em>Default Definition</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Default Definition</em>' reference.
+   * Sets the value of the '{@link org.eclipse.net4j.util.defs.DefContainer#getDefaultDefinition <em>Default Definition</em>}' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>Default Definition</em>' reference.
    * @see #getDefaultDefinition()
    * @generated
    */
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ExecutorServiceDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ExecutorServiceDef.java
index b2dd01bb26..8156c0a62f 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ExecutorServiceDef.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ExecutorServiceDef.java
@@ -14,7 +14,8 @@ package org.eclipse.net4j.util.defs;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Executor Service Def</b></em>'. <!--
  * end-user-doc -->
- * 
+ *
+ *
  * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getExecutorServiceDef()
  * @model abstract="true"
  * @generated
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/NegotiatorDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/NegotiatorDef.java
index f6292a44b8..73cc29b6f8 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/NegotiatorDef.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/NegotiatorDef.java
@@ -13,7 +13,8 @@ package org.eclipse.net4j.util.defs;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Negotiator Def</b></em>'. <!-- end-user-doc -->
- * 
+ *
+ *
  * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getNegotiatorDef()
  * @model abstract="true"
  * @generated
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsFactory.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsFactory.java
index 42567ca1de..6a9e37b297 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsFactory.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsFactory.java
@@ -16,87 +16,86 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
  * the model. <!-- end-user-doc -->
- * 
  * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage
  * @generated
  */
 public interface Net4jUtilDefsFactory extends EFactory
 {
   /**
-   * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The singleton instance of the factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   Net4jUtilDefsFactory eINSTANCE = org.eclipse.net4j.util.defs.impl.Net4jUtilDefsFactoryImpl.init();
 
   /**
-   * Returns a new object of class '<em>Def Container</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Def Container</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Def Container</em>'.
    * @generated
    */
   DefContainer createDefContainer();
 
   /**
-   * Returns a new object of class '<em>Thread Pool Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Thread Pool Def</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Thread Pool Def</em>'.
    * @generated
    */
   ThreadPoolDef createThreadPoolDef();
 
   /**
-   * Returns a new object of class '<em>Randomizer Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Randomizer Def</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Randomizer Def</em>'.
    * @generated
    */
   RandomizerDef createRandomizerDef();
 
   /**
-   * Returns a new object of class '<em>User Manager Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>User Manager Def</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>User Manager Def</em>'.
    * @generated
    */
   UserManagerDef createUserManagerDef();
 
   /**
-   * Returns a new object of class '<em>User</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>User</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>User</em>'.
    * @generated
    */
   User createUser();
 
   /**
-   * Returns a new object of class '<em>Password Credentials Provider Def</em>'. <!-- begin-user-doc --> <!--
+   * Returns a new object of class '<em>Password Credentials Provider Def</em>'.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @return a new object of class '<em>Password Credentials Provider Def</em>'.
    * @generated
    */
   PasswordCredentialsProviderDef createPasswordCredentialsProviderDef();
 
   /**
-   * Returns a new object of class '<em>Response Negotiator Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Response Negotiator Def</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Response Negotiator Def</em>'.
    * @generated
    */
   ResponseNegotiatorDef createResponseNegotiatorDef();
 
   /**
-   * Returns a new object of class '<em>Challenge Negotiator Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Challenge Negotiator Def</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Challenge Negotiator Def</em>'.
    * @generated
    */
   ChallengeNegotiatorDef createChallengeNegotiatorDef();
 
   /**
-   * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the package supported by this factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the package supported by this factory.
    * @generated
    */
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsPackage.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsPackage.java
index c975c9ac14..1015035760 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsPackage.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsPackage.java
@@ -25,7 +25,6 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * 
  * @see org.eclipse.net4j.util.defs.Net4jUtilDefsFactory
  * @model kind="package"
  * @generated
@@ -33,37 +32,36 @@ import org.eclipse.emf.ecore.EReference;
 public interface Net4jUtilDefsPackage extends EPackage
 {
   /**
-   * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The package name.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   String eNAME = "defs"; //$NON-NLS-1$
 
   /**
-   * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The package namespace URI.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   String eNS_URI = "http://www.eclipse.org/NET4J/util/defs/1.0.0"; //$NON-NLS-1$
 
   /**
-   * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The package namespace name.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   String eNS_PREFIX = "net4j.util.defs"; //$NON-NLS-1$
 
   /**
-   * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The singleton instance of the package.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   Net4jUtilDefsPackage eINSTANCE = org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl.init();
 
   /**
-   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.DefContainerImpl <em>Def Container</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.DefContainerImpl <em>Def Container</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.net4j.util.defs.impl.DefContainerImpl
    * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getDefContainer()
    * @generated
@@ -71,9 +69,9 @@ public interface Net4jUtilDefsPackage extends EPackage
   int DEF_CONTAINER = 0;
 
   /**
-   * The feature id for the '<em><b>Definitions</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Definitions</b></em>' containment reference list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
@@ -108,17 +106,16 @@ public interface Net4jUtilDefsPackage extends EPackage
   int DEF = 1;
 
   /**
-   * The number of structural features of the '<em>Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The number of structural features of the '<em>Def</em>' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int DEF_FEATURE_COUNT = 0;
 
   /**
-   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.ExecutorServiceDefImpl
-   * <em>Executor Service Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.ExecutorServiceDefImpl <em>Executor Service Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.net4j.util.defs.impl.ExecutorServiceDefImpl
    * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getExecutorServiceDef()
    * @generated
@@ -126,18 +123,17 @@ public interface Net4jUtilDefsPackage extends EPackage
   int EXECUTOR_SERVICE_DEF = 2;
 
   /**
-   * The number of structural features of the '<em>Executor Service Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Executor Service Def</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int EXECUTOR_SERVICE_DEF_FEATURE_COUNT = DEF_FEATURE_COUNT + 0;
 
   /**
-   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.ThreadPoolDefImpl <em>Thread Pool Def</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.ThreadPoolDefImpl <em>Thread Pool Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.net4j.util.defs.impl.ThreadPoolDefImpl
    * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getThreadPoolDef()
    * @generated
@@ -145,18 +141,17 @@ public interface Net4jUtilDefsPackage extends EPackage
   int THREAD_POOL_DEF = 3;
 
   /**
-   * The number of structural features of the '<em>Thread Pool Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Thread Pool Def</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int THREAD_POOL_DEF_FEATURE_COUNT = EXECUTOR_SERVICE_DEF_FEATURE_COUNT + 0;
 
   /**
-   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.RandomizerDefImpl <em>Randomizer Def</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.RandomizerDefImpl <em>Randomizer Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.net4j.util.defs.impl.RandomizerDefImpl
    * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getRandomizerDef()
    * @generated
@@ -164,24 +159,24 @@ public interface Net4jUtilDefsPackage extends EPackage
   int RANDOMIZER_DEF = 4;
 
   /**
-   * The feature id for the '<em><b>Algorithm Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Algorithm Name</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int RANDOMIZER_DEF__ALGORITHM_NAME = DEF_FEATURE_COUNT + 0;
 
   /**
-   * The feature id for the '<em><b>Provider Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Provider Name</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int RANDOMIZER_DEF__PROVIDER_NAME = DEF_FEATURE_COUNT + 1;
 
   /**
-   * The feature id for the '<em><b>Seed</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Seed</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -197,9 +192,8 @@ public interface Net4jUtilDefsPackage extends EPackage
   int RANDOMIZER_DEF_FEATURE_COUNT = DEF_FEATURE_COUNT + 3;
 
   /**
-   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.UserManagerDefImpl <em>User Manager Def</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.UserManagerDefImpl <em>User Manager Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.net4j.util.defs.impl.UserManagerDefImpl
    * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getUserManagerDef()
    * @generated
@@ -217,9 +211,8 @@ public interface Net4jUtilDefsPackage extends EPackage
   int USER = 6;
 
   /**
-   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.CredentialsProviderDefImpl
-   * <em>Credentials Provider Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.CredentialsProviderDefImpl <em>Credentials Provider Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.net4j.util.defs.impl.CredentialsProviderDefImpl
    * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getCredentialsProviderDef()
    * @generated
@@ -227,9 +220,8 @@ public interface Net4jUtilDefsPackage extends EPackage
   int CREDENTIALS_PROVIDER_DEF = 8;
 
   /**
-   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.PasswordCredentialsProviderDefImpl
-   * <em>Password Credentials Provider Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.PasswordCredentialsProviderDefImpl <em>Password Credentials Provider Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.net4j.util.defs.impl.PasswordCredentialsProviderDefImpl
    * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getPasswordCredentialsProviderDef()
    * @generated
@@ -237,9 +229,8 @@ public interface Net4jUtilDefsPackage extends EPackage
   int PASSWORD_CREDENTIALS_PROVIDER_DEF = 7;
 
   /**
-   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.NegotiatorDefImpl <em>Negotiator Def</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.NegotiatorDefImpl <em>Negotiator Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.net4j.util.defs.impl.NegotiatorDefImpl
    * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getNegotiatorDef()
    * @generated
@@ -247,9 +238,8 @@ public interface Net4jUtilDefsPackage extends EPackage
   int NEGOTIATOR_DEF = 9;
 
   /**
-   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.ResponseNegotiatorDefImpl
-   * <em>Response Negotiator Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.ResponseNegotiatorDefImpl <em>Response Negotiator Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.net4j.util.defs.impl.ResponseNegotiatorDefImpl
    * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getResponseNegotiatorDef()
    * @generated
@@ -257,9 +247,8 @@ public interface Net4jUtilDefsPackage extends EPackage
   int RESPONSE_NEGOTIATOR_DEF = 10;
 
   /**
-   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.ChallengeNegotiatorDefImpl
-   * <em>Challenge Negotiator Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.net4j.util.defs.impl.ChallengeNegotiatorDefImpl <em>Challenge Negotiator Def</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.net4j.util.defs.impl.ChallengeNegotiatorDefImpl
    * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getChallengeNegotiatorDef()
    * @generated
@@ -277,10 +266,9 @@ public interface Net4jUtilDefsPackage extends EPackage
   EClass getDefContainer();
 
   /**
-   * Returns the meta object for the containment reference list '
-   * {@link org.eclipse.net4j.util.defs.DefContainer#getDefinitions <em>Definitions</em>}'. <!-- begin-user-doc --> <!--
+   * Returns the meta object for the containment reference list '{@link org.eclipse.net4j.util.defs.DefContainer#getDefinitions <em>Definitions</em>}'.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @return the meta object for the containment reference list '<em>Definitions</em>'.
    * @see org.eclipse.net4j.util.defs.DefContainer#getDefinitions()
    * @see #getDefContainer()
@@ -289,9 +277,8 @@ public interface Net4jUtilDefsPackage extends EPackage
   EReference getDefContainer_Definitions();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.util.defs.DefContainer#getDefaultDefinition
-   * <em>Default Definition</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.util.defs.DefContainer#getDefaultDefinition <em>Default Definition</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the reference '<em>Default Definition</em>'.
    * @see org.eclipse.net4j.util.defs.DefContainer#getDefaultDefinition()
    * @see #getDefContainer()
@@ -300,83 +287,83 @@ public interface Net4jUtilDefsPackage extends EPackage
   EReference getDefContainer_DefaultDefinition();
 
   /**
-   * The feature id for the '<em><b>User</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>User</b></em>' reference list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int USER_MANAGER_DEF__USER = DEF_FEATURE_COUNT + 0;
 
   /**
-   * The number of structural features of the '<em>User Manager Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>User Manager Def</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int USER_MANAGER_DEF_FEATURE_COUNT = DEF_FEATURE_COUNT + 1;
 
   /**
-   * The feature id for the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>User ID</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int USER__USER_ID = 0;
 
   /**
-   * The feature id for the '<em><b>Password</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Password</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int USER__PASSWORD = 1;
 
   /**
-   * The number of structural features of the '<em>User</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The number of structural features of the '<em>User</em>' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int USER_FEATURE_COUNT = 2;
 
   /**
-   * The feature id for the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>User ID</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int CREDENTIALS_PROVIDER_DEF__USER_ID = DEF_FEATURE_COUNT + 0;
 
   /**
-   * The number of structural features of the '<em>Credentials Provider Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Credentials Provider Def</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int CREDENTIALS_PROVIDER_DEF_FEATURE_COUNT = DEF_FEATURE_COUNT + 1;
 
   /**
-   * The feature id for the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>User ID</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int PASSWORD_CREDENTIALS_PROVIDER_DEF__USER_ID = CREDENTIALS_PROVIDER_DEF__USER_ID;
 
   /**
-   * The feature id for the '<em><b>Password</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Password</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int PASSWORD_CREDENTIALS_PROVIDER_DEF__PASSWORD = CREDENTIALS_PROVIDER_DEF_FEATURE_COUNT + 0;
 
   /**
-   * The number of structural features of the '<em>Password Credentials Provider Def</em>' class. <!-- begin-user-doc
+   * The number of structural features of the '<em>Password Credentials Provider Def</em>' class.
+   * <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
@@ -401,43 +388,43 @@ public interface Net4jUtilDefsPackage extends EPackage
   int RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER = NEGOTIATOR_DEF_FEATURE_COUNT + 0;
 
   /**
-   * The number of structural features of the '<em>Response Negotiator Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Response Negotiator Def</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int RESPONSE_NEGOTIATOR_DEF_FEATURE_COUNT = NEGOTIATOR_DEF_FEATURE_COUNT + 1;
 
   /**
-   * The feature id for the '<em><b>User Manager</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>User Manager</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER = NEGOTIATOR_DEF_FEATURE_COUNT + 0;
 
   /**
-   * The feature id for the '<em><b>Randomizer</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Randomizer</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER = NEGOTIATOR_DEF_FEATURE_COUNT + 1;
 
   /**
-   * The number of structural features of the '<em>Challenge Negotiator Def</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Challenge Negotiator Def</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int CHALLENGE_NEGOTIATOR_DEF_FEATURE_COUNT = NEGOTIATOR_DEF_FEATURE_COUNT + 2;
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.Def <em>Def</em>}'. <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.Def <em>Def</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @return the meta object for class '<em>Def</em>'.
    * @see org.eclipse.net4j.util.defs.Def
    * @generated
@@ -445,9 +432,8 @@ public interface Net4jUtilDefsPackage extends EPackage
   EClass getDef();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.ExecutorServiceDef
-   * <em>Executor Service Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.ExecutorServiceDef <em>Executor Service Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Executor Service Def</em>'.
    * @see org.eclipse.net4j.util.defs.ExecutorServiceDef
    * @generated
@@ -457,7 +443,6 @@ public interface Net4jUtilDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.ThreadPoolDef <em>Thread Pool Def</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @return the meta object for class '<em>Thread Pool Def</em>'.
    * @see org.eclipse.net4j.util.defs.ThreadPoolDef
    * @generated
@@ -475,9 +460,8 @@ public interface Net4jUtilDefsPackage extends EPackage
   EClass getRandomizerDef();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.net4j.util.defs.RandomizerDef#getAlgorithmName
-   * <em>Algorithm Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.util.defs.RandomizerDef#getAlgorithmName <em>Algorithm Name</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Algorithm Name</em>'.
    * @see org.eclipse.net4j.util.defs.RandomizerDef#getAlgorithmName()
    * @see #getRandomizerDef()
@@ -486,9 +470,8 @@ public interface Net4jUtilDefsPackage extends EPackage
   EAttribute getRandomizerDef_AlgorithmName();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.net4j.util.defs.RandomizerDef#getProviderName
-   * <em>Provider Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.util.defs.RandomizerDef#getProviderName <em>Provider Name</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Provider Name</em>'.
    * @see org.eclipse.net4j.util.defs.RandomizerDef#getProviderName()
    * @see #getRandomizerDef()
@@ -497,9 +480,8 @@ public interface Net4jUtilDefsPackage extends EPackage
   EAttribute getRandomizerDef_ProviderName();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.net4j.util.defs.RandomizerDef#getSeed <em>Seed</em>}
-   * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.util.defs.RandomizerDef#getSeed <em>Seed</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Seed</em>'.
    * @see org.eclipse.net4j.util.defs.RandomizerDef#getSeed()
    * @see #getRandomizerDef()
@@ -510,7 +492,6 @@ public interface Net4jUtilDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.UserManagerDef <em>User Manager Def</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @return the meta object for class '<em>User Manager Def</em>'.
    * @see org.eclipse.net4j.util.defs.UserManagerDef
    * @generated
@@ -518,9 +499,8 @@ public interface Net4jUtilDefsPackage extends EPackage
   EClass getUserManagerDef();
 
   /**
-   * Returns the meta object for the reference list '{@link org.eclipse.net4j.util.defs.UserManagerDef#getUser
-   * <em>User</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the reference list '{@link org.eclipse.net4j.util.defs.UserManagerDef#getUser <em>User</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the reference list '<em>User</em>'.
    * @see org.eclipse.net4j.util.defs.UserManagerDef#getUser()
    * @see #getUserManagerDef()
@@ -529,9 +509,9 @@ public interface Net4jUtilDefsPackage extends EPackage
   EReference getUserManagerDef_User();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.User <em>User</em>}'. <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.User <em>User</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @return the meta object for class '<em>User</em>'.
    * @see org.eclipse.net4j.util.defs.User
    * @generated
@@ -541,7 +521,6 @@ public interface Net4jUtilDefsPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.net4j.util.defs.User#getUserID <em>User ID</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute '<em>User ID</em>'.
    * @see org.eclipse.net4j.util.defs.User#getUserID()
    * @see #getUser()
@@ -552,7 +531,6 @@ public interface Net4jUtilDefsPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.net4j.util.defs.User#getPassword <em>Password</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute '<em>Password</em>'.
    * @see org.eclipse.net4j.util.defs.User#getPassword()
    * @see #getUser()
@@ -561,9 +539,8 @@ public interface Net4jUtilDefsPackage extends EPackage
   EAttribute getUser_Password();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.PasswordCredentialsProviderDef
-   * <em>Password Credentials Provider Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.PasswordCredentialsProviderDef <em>Password Credentials Provider Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Password Credentials Provider Def</em>'.
    * @see org.eclipse.net4j.util.defs.PasswordCredentialsProviderDef
    * @generated
@@ -583,9 +560,8 @@ public interface Net4jUtilDefsPackage extends EPackage
   EAttribute getPasswordCredentialsProviderDef_Password();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.CredentialsProviderDef
-   * <em>Credentials Provider Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.CredentialsProviderDef <em>Credentials Provider Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Credentials Provider Def</em>'.
    * @see org.eclipse.net4j.util.defs.CredentialsProviderDef
    * @generated
@@ -593,9 +569,8 @@ public interface Net4jUtilDefsPackage extends EPackage
   EClass getCredentialsProviderDef();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.net4j.util.defs.CredentialsProviderDef#getUserID
-   * <em>User ID</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.util.defs.CredentialsProviderDef#getUserID <em>User ID</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the attribute '<em>User ID</em>'.
    * @see org.eclipse.net4j.util.defs.CredentialsProviderDef#getUserID()
    * @see #getCredentialsProviderDef()
@@ -614,9 +589,8 @@ public interface Net4jUtilDefsPackage extends EPackage
   EClass getNegotiatorDef();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.ResponseNegotiatorDef
-   * <em>Response Negotiator Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.ResponseNegotiatorDef <em>Response Negotiator Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Response Negotiator Def</em>'.
    * @see org.eclipse.net4j.util.defs.ResponseNegotiatorDef
    * @generated
@@ -624,10 +598,8 @@ public interface Net4jUtilDefsPackage extends EPackage
   EClass getResponseNegotiatorDef();
 
   /**
-   * Returns the meta object for the reference '
-   * {@link org.eclipse.net4j.util.defs.ResponseNegotiatorDef#getCredentialsProvider <em>Credentials Provider</em>}'.
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.util.defs.ResponseNegotiatorDef#getCredentialsProvider <em>Credentials Provider</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the reference '<em>Credentials Provider</em>'.
    * @see org.eclipse.net4j.util.defs.ResponseNegotiatorDef#getCredentialsProvider()
    * @see #getResponseNegotiatorDef()
@@ -636,9 +608,8 @@ public interface Net4jUtilDefsPackage extends EPackage
   EReference getResponseNegotiatorDef_CredentialsProvider();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.ChallengeNegotiatorDef
-   * <em>Challenge Negotiator Def</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.net4j.util.defs.ChallengeNegotiatorDef <em>Challenge Negotiator Def</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Challenge Negotiator Def</em>'.
    * @see org.eclipse.net4j.util.defs.ChallengeNegotiatorDef
    * @generated
@@ -658,9 +629,8 @@ public interface Net4jUtilDefsPackage extends EPackage
   EReference getChallengeNegotiatorDef_UserManager();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.net4j.util.defs.ChallengeNegotiatorDef#getRandomizer
-   * <em>Randomizer</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the reference '{@link org.eclipse.net4j.util.defs.ChallengeNegotiatorDef#getRandomizer <em>Randomizer</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the reference '<em>Randomizer</em>'.
    * @see org.eclipse.net4j.util.defs.ChallengeNegotiatorDef#getRandomizer()
    * @see #getChallengeNegotiatorDef()
@@ -669,8 +639,8 @@ public interface Net4jUtilDefsPackage extends EPackage
   EReference getChallengeNegotiatorDef_Randomizer();
 
   /**
-   * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the factory that creates the instances of the model.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the factory that creates the instances of the model.
    * @generated
    */
@@ -685,15 +655,13 @@ public interface Net4jUtilDefsPackage extends EPackage
    * <li>and each data type</li>
    * </ul>
    * <!-- end-user-doc -->
-   * 
    * @generated
    */
   interface Literals
   {
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.DefContainerImpl <em>Def Container</em>}
-     * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.DefContainerImpl <em>Def Container</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.net4j.util.defs.impl.DefContainerImpl
      * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getDefContainer()
      * @generated
@@ -709,9 +677,9 @@ public interface Net4jUtilDefsPackage extends EPackage
     EReference DEF_CONTAINER__DEFINITIONS = eINSTANCE.getDefContainer_Definitions();
 
     /**
-     * The meta object literal for the '<em><b>Default Definition</b></em>' reference feature. <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Default Definition</b></em>' reference feature.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
      * @generated
      */
     EReference DEF_CONTAINER__DEFAULT_DEFINITION = eINSTANCE.getDefContainer_DefaultDefinition();
@@ -727,9 +695,8 @@ public interface Net4jUtilDefsPackage extends EPackage
     EClass DEF = eINSTANCE.getDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.ExecutorServiceDefImpl
-     * <em>Executor Service Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.ExecutorServiceDefImpl <em>Executor Service Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.net4j.util.defs.impl.ExecutorServiceDefImpl
      * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getExecutorServiceDef()
      * @generated
@@ -737,9 +704,8 @@ public interface Net4jUtilDefsPackage extends EPackage
     EClass EXECUTOR_SERVICE_DEF = eINSTANCE.getExecutorServiceDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.ThreadPoolDefImpl
-     * <em>Thread Pool Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.ThreadPoolDefImpl <em>Thread Pool Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.net4j.util.defs.impl.ThreadPoolDefImpl
      * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getThreadPoolDef()
      * @generated
@@ -747,9 +713,8 @@ public interface Net4jUtilDefsPackage extends EPackage
     EClass THREAD_POOL_DEF = eINSTANCE.getThreadPoolDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.RandomizerDefImpl
-     * <em>Randomizer Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.RandomizerDefImpl <em>Randomizer Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.net4j.util.defs.impl.RandomizerDefImpl
      * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getRandomizerDef()
      * @generated
@@ -757,33 +722,32 @@ public interface Net4jUtilDefsPackage extends EPackage
     EClass RANDOMIZER_DEF = eINSTANCE.getRandomizerDef();
 
     /**
-     * The meta object literal for the '<em><b>Algorithm Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Algorithm Name</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute RANDOMIZER_DEF__ALGORITHM_NAME = eINSTANCE.getRandomizerDef_AlgorithmName();
 
     /**
-     * The meta object literal for the '<em><b>Provider Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Provider Name</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute RANDOMIZER_DEF__PROVIDER_NAME = eINSTANCE.getRandomizerDef_ProviderName();
 
     /**
-     * The meta object literal for the '<em><b>Seed</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Seed</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute RANDOMIZER_DEF__SEED = eINSTANCE.getRandomizerDef_Seed();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.UserManagerDefImpl
-     * <em>User Manager Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.UserManagerDefImpl <em>User Manager Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.net4j.util.defs.impl.UserManagerDefImpl
      * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getUserManagerDef()
      * @generated
@@ -791,9 +755,9 @@ public interface Net4jUtilDefsPackage extends EPackage
     EClass USER_MANAGER_DEF = eINSTANCE.getUserManagerDef();
 
     /**
-     * The meta object literal for the '<em><b>User</b></em>' reference list feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>User</b></em>' reference list feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EReference USER_MANAGER_DEF__USER = eINSTANCE.getUserManagerDef_User();
@@ -809,25 +773,24 @@ public interface Net4jUtilDefsPackage extends EPackage
     EClass USER = eINSTANCE.getUser();
 
     /**
-     * The meta object literal for the '<em><b>User ID</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>User ID</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute USER__USER_ID = eINSTANCE.getUser_UserID();
 
     /**
-     * The meta object literal for the '<em><b>Password</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Password</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute USER__PASSWORD = eINSTANCE.getUser_Password();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.PasswordCredentialsProviderDefImpl
-     * <em>Password Credentials Provider Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.PasswordCredentialsProviderDefImpl <em>Password Credentials Provider Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.net4j.util.defs.impl.PasswordCredentialsProviderDefImpl
      * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getPasswordCredentialsProviderDef()
      * @generated
@@ -835,17 +798,16 @@ public interface Net4jUtilDefsPackage extends EPackage
     EClass PASSWORD_CREDENTIALS_PROVIDER_DEF = eINSTANCE.getPasswordCredentialsProviderDef();
 
     /**
-     * The meta object literal for the '<em><b>Password</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Password</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute PASSWORD_CREDENTIALS_PROVIDER_DEF__PASSWORD = eINSTANCE.getPasswordCredentialsProviderDef_Password();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.CredentialsProviderDefImpl
-     * <em>Credentials Provider Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.CredentialsProviderDefImpl <em>Credentials Provider Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.net4j.util.defs.impl.CredentialsProviderDefImpl
      * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getCredentialsProviderDef()
      * @generated
@@ -853,17 +815,16 @@ public interface Net4jUtilDefsPackage extends EPackage
     EClass CREDENTIALS_PROVIDER_DEF = eINSTANCE.getCredentialsProviderDef();
 
     /**
-     * The meta object literal for the '<em><b>User ID</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>User ID</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute CREDENTIALS_PROVIDER_DEF__USER_ID = eINSTANCE.getCredentialsProviderDef_UserID();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.NegotiatorDefImpl
-     * <em>Negotiator Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.NegotiatorDefImpl <em>Negotiator Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.net4j.util.defs.impl.NegotiatorDefImpl
      * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getNegotiatorDef()
      * @generated
@@ -871,9 +832,8 @@ public interface Net4jUtilDefsPackage extends EPackage
     EClass NEGOTIATOR_DEF = eINSTANCE.getNegotiatorDef();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.ResponseNegotiatorDefImpl
-     * <em>Response Negotiator Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.ResponseNegotiatorDefImpl <em>Response Negotiator Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.net4j.util.defs.impl.ResponseNegotiatorDefImpl
      * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getResponseNegotiatorDef()
      * @generated
@@ -881,17 +841,16 @@ public interface Net4jUtilDefsPackage extends EPackage
     EClass RESPONSE_NEGOTIATOR_DEF = eINSTANCE.getResponseNegotiatorDef();
 
     /**
-     * The meta object literal for the '<em><b>Credentials Provider</b></em>' reference feature. <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Credentials Provider</b></em>' reference feature.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
      * @generated
      */
     EReference RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER = eINSTANCE.getResponseNegotiatorDef_CredentialsProvider();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.ChallengeNegotiatorDefImpl
-     * <em>Challenge Negotiator Def</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * The meta object literal for the '{@link org.eclipse.net4j.util.defs.impl.ChallengeNegotiatorDefImpl <em>Challenge Negotiator Def</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.net4j.util.defs.impl.ChallengeNegotiatorDefImpl
      * @see org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl#getChallengeNegotiatorDef()
      * @generated
@@ -899,17 +858,17 @@ public interface Net4jUtilDefsPackage extends EPackage
     EClass CHALLENGE_NEGOTIATOR_DEF = eINSTANCE.getChallengeNegotiatorDef();
 
     /**
-     * The meta object literal for the '<em><b>User Manager</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>User Manager</b></em>' reference feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EReference CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER = eINSTANCE.getChallengeNegotiatorDef_UserManager();
 
     /**
-     * The meta object literal for the '<em><b>Randomizer</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Randomizer</b></em>' reference feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EReference CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER = eINSTANCE.getChallengeNegotiatorDef_Randomizer();
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/PasswordCredentialsProviderDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/PasswordCredentialsProviderDef.java
index 508f5a673b..c1c814cbe8 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/PasswordCredentialsProviderDef.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/PasswordCredentialsProviderDef.java
@@ -14,13 +14,14 @@ package org.eclipse.net4j.util.defs;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Password Credentials Provider Def</b></em>'.
  * <!-- end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.net4j.util.defs.PasswordCredentialsProviderDef#getPassword <em>Password</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.PasswordCredentialsProviderDef#getPassword <em>Password</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getPasswordCredentialsProviderDef()
  * @model
  * @generated
@@ -28,13 +29,13 @@ package org.eclipse.net4j.util.defs;
 public interface PasswordCredentialsProviderDef extends CredentialsProviderDef
 {
   /**
-   * Returns the value of the '<em><b>Password</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Password</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Password</em>' attribute isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Password</em>' attribute.
    * @see #setPassword(String)
    * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getPasswordCredentialsProviderDef_Password()
@@ -44,11 +45,9 @@ public interface PasswordCredentialsProviderDef extends CredentialsProviderDef
   String getPassword();
 
   /**
-   * Sets the value of the '{@link org.eclipse.net4j.util.defs.PasswordCredentialsProviderDef#getPassword
-   * <em>Password</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Password</em>' attribute.
+   * Sets the value of the '{@link org.eclipse.net4j.util.defs.PasswordCredentialsProviderDef#getPassword <em>Password</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>Password</em>' attribute.
    * @see #getPassword()
    * @generated
    */
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/RandomizerDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/RandomizerDef.java
index 293d13b726..4902b092bf 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/RandomizerDef.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/RandomizerDef.java
@@ -13,15 +13,16 @@ package org.eclipse.net4j.util.defs;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Randomizer Def</b></em>'. <!-- end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.net4j.util.defs.RandomizerDef#getAlgorithmName <em>Algorithm Name</em>}</li>
- * <li>{@link org.eclipse.net4j.util.defs.RandomizerDef#getProviderName <em>Provider Name</em>}</li>
- * <li>{@link org.eclipse.net4j.util.defs.RandomizerDef#getSeed <em>Seed</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.RandomizerDef#getAlgorithmName <em>Algorithm Name</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.RandomizerDef#getProviderName <em>Provider Name</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.RandomizerDef#getSeed <em>Seed</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getRandomizerDef()
  * @model
  * @generated
@@ -29,13 +30,13 @@ package org.eclipse.net4j.util.defs;
 public interface RandomizerDef extends Def
 {
   /**
-   * Returns the value of the '<em><b>Algorithm Name</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Algorithm Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Algorithm Name</em>' attribute isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Algorithm Name</em>' attribute.
    * @see #isSetAlgorithmName()
    * @see #unsetAlgorithmName()
@@ -47,11 +48,9 @@ public interface RandomizerDef extends Def
   String getAlgorithmName();
 
   /**
-   * Sets the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getAlgorithmName <em>Algorithm Name</em>}'
-   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Algorithm Name</em>' attribute.
+   * Sets the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getAlgorithmName <em>Algorithm Name</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>Algorithm Name</em>' attribute.
    * @see #isSetAlgorithmName()
    * @see #unsetAlgorithmName()
    * @see #getAlgorithmName()
@@ -60,9 +59,8 @@ public interface RandomizerDef extends Def
   void setAlgorithmName(String value);
 
   /**
-   * Unsets the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getAlgorithmName <em>Algorithm Name</em>}
-   * ' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Unsets the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getAlgorithmName <em>Algorithm Name</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #isSetAlgorithmName()
    * @see #getAlgorithmName()
    * @see #setAlgorithmName(String)
@@ -71,9 +69,8 @@ public interface RandomizerDef extends Def
   void unsetAlgorithmName();
 
   /**
-   * Returns whether the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getAlgorithmName
-   * <em>Algorithm Name</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns whether the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getAlgorithmName <em>Algorithm Name</em>}' attribute is set.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return whether the value of the '<em>Algorithm Name</em>' attribute is set.
    * @see #unsetAlgorithmName()
    * @see #getAlgorithmName()
@@ -83,13 +80,13 @@ public interface RandomizerDef extends Def
   boolean isSetAlgorithmName();
 
   /**
-   * Returns the value of the '<em><b>Provider Name</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Provider Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Provider Name</em>' attribute isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Provider Name</em>' attribute.
    * @see #isSetProviderName()
    * @see #unsetProviderName()
@@ -101,11 +98,9 @@ public interface RandomizerDef extends Def
   String getProviderName();
 
   /**
-   * Sets the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getProviderName <em>Provider Name</em>}'
-   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Provider Name</em>' attribute.
+   * Sets the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getProviderName <em>Provider Name</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>Provider Name</em>' attribute.
    * @see #isSetProviderName()
    * @see #unsetProviderName()
    * @see #getProviderName()
@@ -114,9 +109,8 @@ public interface RandomizerDef extends Def
   void setProviderName(String value);
 
   /**
-   * Unsets the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getProviderName <em>Provider Name</em>}'
-   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Unsets the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getProviderName <em>Provider Name</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #isSetProviderName()
    * @see #getProviderName()
    * @see #setProviderName(String)
@@ -125,9 +119,8 @@ public interface RandomizerDef extends Def
   void unsetProviderName();
 
   /**
-   * Returns whether the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getProviderName
-   * <em>Provider Name</em>}' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns whether the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getProviderName <em>Provider Name</em>}' attribute is set.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return whether the value of the '<em>Provider Name</em>' attribute is set.
    * @see #unsetProviderName()
    * @see #getProviderName()
@@ -137,12 +130,12 @@ public interface RandomizerDef extends Def
   boolean isSetProviderName();
 
   /**
-   * Returns the value of the '<em><b>Seed</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Seed</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Seed</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Seed</em>' attribute.
    * @see #isSetSeed()
    * @see #unsetSeed()
@@ -178,9 +171,8 @@ public interface RandomizerDef extends Def
   void unsetSeed();
 
   /**
-   * Returns whether the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getSeed <em>Seed</em>}'
-   * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns whether the value of the '{@link org.eclipse.net4j.util.defs.RandomizerDef#getSeed <em>Seed</em>}' attribute is set.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return whether the value of the '<em>Seed</em>' attribute is set.
    * @see #unsetSeed()
    * @see #getSeed()
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ResponseNegotiatorDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ResponseNegotiatorDef.java
index cdc939c22e..759fe7a43e 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ResponseNegotiatorDef.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ResponseNegotiatorDef.java
@@ -14,13 +14,14 @@ package org.eclipse.net4j.util.defs;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Response Negotiator Def</b></em>'. <!--
  * end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.net4j.util.defs.ResponseNegotiatorDef#getCredentialsProvider <em>Credentials Provider</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.ResponseNegotiatorDef#getCredentialsProvider <em>Credentials Provider</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getResponseNegotiatorDef()
  * @model
  * @generated
@@ -28,13 +29,13 @@ package org.eclipse.net4j.util.defs;
 public interface ResponseNegotiatorDef extends NegotiatorDef
 {
   /**
-   * Returns the value of the '<em><b>Credentials Provider</b></em>' reference. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Credentials Provider</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Credentials Provider</em>' reference isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Credentials Provider</em>' reference.
    * @see #setCredentialsProvider(CredentialsProviderDef)
    * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getResponseNegotiatorDef_CredentialsProvider()
@@ -44,11 +45,9 @@ public interface ResponseNegotiatorDef extends NegotiatorDef
   CredentialsProviderDef getCredentialsProvider();
 
   /**
-   * Sets the value of the '{@link org.eclipse.net4j.util.defs.ResponseNegotiatorDef#getCredentialsProvider
-   * <em>Credentials Provider</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Credentials Provider</em>' reference.
+   * Sets the value of the '{@link org.eclipse.net4j.util.defs.ResponseNegotiatorDef#getCredentialsProvider <em>Credentials Provider</em>}' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>Credentials Provider</em>' reference.
    * @see #getCredentialsProvider()
    * @generated
    */
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ThreadPoolDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ThreadPoolDef.java
index a8b852d3d0..152f244a9f 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ThreadPoolDef.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/ThreadPoolDef.java
@@ -13,7 +13,8 @@ package org.eclipse.net4j.util.defs;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Thread Pool Def</b></em>'. <!-- end-user-doc -->
- * 
+ *
+ *
  * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getThreadPoolDef()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/User.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/User.java
index 4d56480b00..754e39671f 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/User.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/User.java
@@ -15,14 +15,15 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>User</b></em>'. <!-- end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.net4j.util.defs.User#getUserID <em>User ID</em>}</li>
- * <li>{@link org.eclipse.net4j.util.defs.User#getPassword <em>Password</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.User#getUserID <em>User ID</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.User#getPassword <em>Password</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getUser()
  * @model
  * @generated
@@ -30,13 +31,13 @@ import org.eclipse.emf.ecore.EObject;
 public interface User extends EObject
 {
   /**
-   * Returns the value of the '<em><b>User ID</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>User ID</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>User ID</em>' attribute isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>User ID</em>' attribute.
    * @see #setUserID(String)
    * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getUser_UserID()
@@ -57,13 +58,13 @@ public interface User extends EObject
   void setUserID(String value);
 
   /**
-   * Returns the value of the '<em><b>Password</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Password</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Password</em>' attribute isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Password</em>' attribute.
    * @see #setPassword(String)
    * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage#getUser_Password()
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/UserManagerDef.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/UserManagerDef.java
index 3dd9e8a1db..177bed4eba 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/UserManagerDef.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/UserManagerDef.java
@@ -30,14 +30,14 @@ import org.eclipse.emf.common.util.EList;
 public interface UserManagerDef extends Def
 {
   /**
-   * Returns the value of the '<em><b>User</b></em>' reference list. The list contents are of type
-   * {@link org.eclipse.net4j.util.defs.User}. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>User</b></em>' reference list.
+   * The list contents are of type {@link org.eclipse.net4j.util.defs.User}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>User</em>' reference list isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>User</em>' reference list.
    * @see #isSetUser()
    * @see #unsetUser()
@@ -50,7 +50,6 @@ public interface UserManagerDef extends Def
   /**
    * Unsets the value of the '{@link org.eclipse.net4j.util.defs.UserManagerDef#getUser <em>User</em>}' reference list.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @see #isSetUser()
    * @see #getUser()
    * @generated
@@ -58,9 +57,8 @@ public interface UserManagerDef extends Def
   void unsetUser();
 
   /**
-   * Returns whether the value of the '{@link org.eclipse.net4j.util.defs.UserManagerDef#getUser <em>User</em>}'
-   * reference list is set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns whether the value of the '{@link org.eclipse.net4j.util.defs.UserManagerDef#getUser <em>User</em>}' reference list is set.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return whether the value of the '<em>User</em>' reference list is set.
    * @see #unsetUser()
    * @see #getUser()
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 3d70dc77c1..504ab5ebd6 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
@@ -31,20 +31,20 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.net4j.util.defs.impl.ChallengeNegotiatorDefImpl#getUserManager <em>User Manager</em>}</li>
- * <li>{@link org.eclipse.net4j.util.defs.impl.ChallengeNegotiatorDefImpl#getRandomizer <em>Randomizer</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.impl.ChallengeNegotiatorDefImpl#getUserManager <em>User Manager</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.impl.ChallengeNegotiatorDefImpl#getRandomizer <em>Randomizer</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements ChallengeNegotiatorDef
 {
 
   /**
-   * The cached value of the '{@link #getUserManager() <em>User Manager</em>}' reference. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getUserManager() <em>User Manager</em>}' reference.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getUserManager()
    * @generated
    * @ordered
@@ -52,9 +52,9 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
   protected UserManagerDef userManager;
 
   /**
-   * The cached value of the '{@link #getRandomizer() <em>Randomizer</em>}' reference. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getRandomizer() <em>Randomizer</em>}' reference.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getRandomizer()
    * @generated
    * @ordered
@@ -63,7 +63,6 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected ChallengeNegotiatorDefImpl()
@@ -73,7 +72,6 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -84,7 +82,6 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public UserManagerDef getUserManager()
@@ -96,10 +93,8 @@ 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;
@@ -107,7 +102,6 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public UserManagerDef basicGetUserManager()
@@ -117,7 +111,6 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setUserManager(UserManagerDef newUserManager)
@@ -125,15 +118,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public RandomizerDef getRandomizer()
@@ -145,10 +135,8 @@ 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;
@@ -156,7 +144,6 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public RandomizerDef basicGetRandomizer()
@@ -166,7 +153,6 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setRandomizer(RandomizerDef newRandomizer)
@@ -174,15 +160,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -192,15 +175,11 @@ 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);
@@ -208,7 +187,6 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -228,7 +206,6 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -248,7 +225,6 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
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 2c4257814d..0e40ee7243 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
@@ -24,18 +24,18 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.net4j.util.defs.impl.CredentialsProviderDefImpl#getUserID <em>User ID</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.impl.CredentialsProviderDefImpl#getUserID <em>User ID</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class CredentialsProviderDefImpl extends DefImpl implements CredentialsProviderDef
 {
   /**
-   * The default value of the '{@link #getUserID() <em>User ID</em>}' attribute. <!-- begin-user-doc --> <!--
+   * The default value of the '{@link #getUserID() <em>User ID</em>}' attribute.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getUserID()
    * @generated
    * @ordered
@@ -43,9 +43,9 @@ public abstract class CredentialsProviderDefImpl extends DefImpl implements Cred
   protected static final String USER_ID_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getUserID() <em>User ID</em>}' attribute. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getUserID() <em>User ID</em>}' attribute.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getUserID()
    * @generated
    * @ordered
@@ -54,7 +54,6 @@ public abstract class CredentialsProviderDefImpl extends DefImpl implements Cred
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected CredentialsProviderDefImpl()
@@ -64,7 +63,6 @@ public abstract class CredentialsProviderDefImpl extends DefImpl implements Cred
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -75,7 +73,6 @@ public abstract class CredentialsProviderDefImpl extends DefImpl implements Cred
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getUserID()
@@ -85,7 +82,6 @@ public abstract class CredentialsProviderDefImpl extends DefImpl implements Cred
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setUserID(String newUserID)
@@ -93,15 +89,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -117,7 +110,6 @@ public abstract class CredentialsProviderDefImpl extends DefImpl implements Cred
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -134,7 +126,6 @@ public abstract class CredentialsProviderDefImpl extends DefImpl implements Cred
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -151,7 +142,6 @@ public abstract class CredentialsProviderDefImpl extends DefImpl implements Cred
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -167,16 +157,13 @@ public abstract class CredentialsProviderDefImpl extends DefImpl implements Cred
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
   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 2a476579e0..d96a527baa 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
@@ -32,11 +32,11 @@ import java.util.Collection;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.net4j.util.defs.impl.DefContainerImpl#getDefinitions <em>Definitions</em>}</li>
- * <li>{@link org.eclipse.net4j.util.defs.impl.DefContainerImpl#getDefaultDefinition <em>Default Definition</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.impl.DefContainerImpl#getDefinitions <em>Definitions</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.impl.DefContainerImpl#getDefaultDefinition <em>Default Definition</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class DefContainerImpl extends EObjectImpl implements DefContainer
@@ -63,7 +63,6 @@ public class DefContainerImpl extends EObjectImpl implements DefContainer
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected DefContainerImpl()
@@ -73,7 +72,6 @@ public class DefContainerImpl extends EObjectImpl implements DefContainer
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -84,7 +82,6 @@ public class DefContainerImpl extends EObjectImpl implements DefContainer
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EList<Def> getDefinitions()
@@ -98,7 +95,6 @@ public class DefContainerImpl extends EObjectImpl implements DefContainer
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Def getDefaultDefinition()
@@ -110,10 +106,8 @@ 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;
@@ -121,7 +115,6 @@ public class DefContainerImpl extends EObjectImpl implements DefContainer
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Def basicGetDefaultDefinition()
@@ -131,7 +124,6 @@ public class DefContainerImpl extends EObjectImpl implements DefContainer
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setDefaultDefinition(Def newDefaultDefinition)
@@ -139,15 +131,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -163,7 +152,6 @@ public class DefContainerImpl extends EObjectImpl implements DefContainer
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -175,9 +163,7 @@ 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);
@@ -185,7 +171,6 @@ public class DefContainerImpl extends EObjectImpl implements DefContainer
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -207,7 +192,6 @@ public class DefContainerImpl extends EObjectImpl implements DefContainer
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -227,7 +211,6 @@ public class DefContainerImpl extends EObjectImpl implements DefContainer
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefImpl.java
index 5d6a1f32d0..e900b0beb7 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefImpl.java
@@ -32,7 +32,7 @@ import java.util.List;
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Definition</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class DefImpl extends EObjectImpl implements Def
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ExecutorServiceDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ExecutorServiceDefImpl.java
index 73104f0186..aa3be7a8b5 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ExecutorServiceDefImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ExecutorServiceDefImpl.java
@@ -21,14 +21,13 @@ import org.eclipse.emf.ecore.EClass;
  * end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class ExecutorServiceDefImpl extends DefImpl implements ExecutorServiceDef
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected ExecutorServiceDefImpl()
@@ -38,7 +37,6 @@ public abstract class ExecutorServiceDefImpl extends DefImpl implements Executor
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/NegotiatorDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/NegotiatorDefImpl.java
index c348f7c2f0..0a77106616 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/NegotiatorDefImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/NegotiatorDefImpl.java
@@ -20,14 +20,13 @@ import org.eclipse.emf.ecore.EClass;
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Negotiator Def</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class NegotiatorDefImpl extends DefImpl implements NegotiatorDef
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected NegotiatorDefImpl()
@@ -37,7 +36,6 @@ public abstract class NegotiatorDefImpl extends DefImpl implements NegotiatorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsFactoryImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsFactoryImpl.java
index cd018d6988..711ed79fb5 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsFactoryImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsFactoryImpl.java
@@ -30,14 +30,13 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- * 
  * @generated
  */
 public class Net4jUtilDefsFactoryImpl extends EFactoryImpl implements Net4jUtilDefsFactory
 {
   /**
-   * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates the default factory implementation.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public static Net4jUtilDefsFactory init()
@@ -59,8 +58,8 @@ public class Net4jUtilDefsFactoryImpl extends EFactoryImpl implements Net4jUtilD
   }
 
   /**
-   * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates an instance of the factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public Net4jUtilDefsFactoryImpl()
@@ -70,7 +69,6 @@ public class Net4jUtilDefsFactoryImpl extends EFactoryImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -101,7 +99,6 @@ public class Net4jUtilDefsFactoryImpl extends EFactoryImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public DefContainer createDefContainer()
@@ -112,7 +109,6 @@ public class Net4jUtilDefsFactoryImpl extends EFactoryImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public ThreadPoolDef createThreadPoolDef()
@@ -123,7 +119,6 @@ public class Net4jUtilDefsFactoryImpl extends EFactoryImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public RandomizerDef createRandomizerDef()
@@ -134,7 +129,6 @@ public class Net4jUtilDefsFactoryImpl extends EFactoryImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public UserManagerDef createUserManagerDef()
@@ -145,7 +139,6 @@ public class Net4jUtilDefsFactoryImpl extends EFactoryImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public User createUser()
@@ -156,7 +149,6 @@ public class Net4jUtilDefsFactoryImpl extends EFactoryImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public PasswordCredentialsProviderDef createPasswordCredentialsProviderDef()
@@ -167,7 +159,6 @@ public class Net4jUtilDefsFactoryImpl extends EFactoryImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public ResponseNegotiatorDef createResponseNegotiatorDef()
@@ -178,7 +169,6 @@ public class Net4jUtilDefsFactoryImpl extends EFactoryImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public ChallengeNegotiatorDef createChallengeNegotiatorDef()
@@ -189,7 +179,6 @@ public class Net4jUtilDefsFactoryImpl extends EFactoryImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Net4jUtilDefsPackage getNet4jUtilDefsPackage()
@@ -199,7 +188,6 @@ public class Net4jUtilDefsFactoryImpl extends EFactoryImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @deprecated
    * @generated
    */
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 463e744028..ca4a51e62a 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
@@ -34,91 +34,78 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- * 
  * @generated
  */
 public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilDefsPackage
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass defContainerEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass defEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass executorServiceDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass threadPoolDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass randomizerDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass userManagerDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass userEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass passwordCredentialsProviderDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass credentialsProviderDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass negotiatorDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass responseNegotiatorDefEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass challengeNegotiatorDefEClass = null;
@@ -143,7 +130,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private static boolean isInited = false;
@@ -163,9 +149,7 @@ 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
@@ -190,7 +174,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getDefContainer()
@@ -200,7 +183,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getDefContainer_Definitions()
@@ -210,7 +192,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getDefContainer_DefaultDefinition()
@@ -220,7 +201,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getDef()
@@ -230,7 +210,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getExecutorServiceDef()
@@ -240,7 +219,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getThreadPoolDef()
@@ -250,7 +228,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getRandomizerDef()
@@ -260,7 +237,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getRandomizerDef_AlgorithmName()
@@ -270,7 +246,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getRandomizerDef_ProviderName()
@@ -280,7 +255,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getRandomizerDef_Seed()
@@ -290,7 +264,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getUserManagerDef()
@@ -300,7 +273,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getUserManagerDef_User()
@@ -310,7 +282,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getUser()
@@ -320,7 +291,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getUser_UserID()
@@ -330,7 +300,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getUser_Password()
@@ -340,7 +309,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getPasswordCredentialsProviderDef()
@@ -350,7 +318,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getPasswordCredentialsProviderDef_Password()
@@ -360,7 +327,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getCredentialsProviderDef()
@@ -370,7 +336,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getCredentialsProviderDef_UserID()
@@ -380,7 +345,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getNegotiatorDef()
@@ -390,7 +354,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getResponseNegotiatorDef()
@@ -400,7 +363,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getResponseNegotiatorDef_CredentialsProvider()
@@ -410,7 +372,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getChallengeNegotiatorDef()
@@ -420,7 +381,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getChallengeNegotiatorDef_UserManager()
@@ -430,7 +390,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getChallengeNegotiatorDef_Randomizer()
@@ -440,7 +399,6 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Net4jUtilDefsFactory getNet4jUtilDefsFactory()
@@ -450,23 +408,20 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private boolean isCreated = false;
 
   /**
-   * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
-   * first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates the meta-model objects for the package.  This method is
+   * guarded to have no affect on any invocation but its first.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public void createPackageContents()
   {
     if (isCreated)
-    {
       return;
-    }
     isCreated = true;
 
     // Create classes and their features
@@ -510,23 +465,20 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private boolean isInitialized = false;
 
   /**
-   * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
-   * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Complete the initialization of the package and its meta-model.  This
+   * method is guarded to have no affect on any invocation but its first.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public void initializePackageContents()
   {
     if (isInitialized)
-    {
       return;
-    }
     isInitialized = true;
 
     // Initialize package
@@ -539,23 +491,23 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
     // Set bounds for type parameters
 
     // Add supertypes to classes
-    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());
+    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());
 
     // Initialize classes and features; add operations and parameters
     initEClass(defContainerEClass, DefContainer.class, "DefContainer", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getDefContainer_Definitions(), getDef(), null, "definitions", null, 1, -1, DefContainer.class,
+    initEReference(getDefContainer_Definitions(), this.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(), getDef(), null, "defaultDefinition", null, 0, 1,
+    initEReference(getDefContainer_DefaultDefinition(), this.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);
 
@@ -584,9 +536,9 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
     initEClass(userManagerDefEClass, UserManagerDef.class, "UserManagerDef", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    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);
+    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);
 
     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,
@@ -611,16 +563,16 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
     initEClass(responseNegotiatorDefEClass, ResponseNegotiatorDef.class, "ResponseNegotiatorDef", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getResponseNegotiatorDef_CredentialsProvider(), getCredentialsProviderDef(), null,
+    initEReference(getResponseNegotiatorDef_CredentialsProvider(), this.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(), getUserManagerDef(), null, "userManager", null, 0, 1,
+    initEReference(getChallengeNegotiatorDef_UserManager(), this.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(), getRandomizerDef(), null, "randomizer", null, 0, 1,
+    initEReference(getChallengeNegotiatorDef_Randomizer(), this.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 33bc2198b0..aefedecab3 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
@@ -28,10 +28,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.net4j.util.defs.impl.PasswordCredentialsProviderDefImpl#getPassword <em>Password</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.impl.PasswordCredentialsProviderDefImpl#getPassword <em>Password</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class PasswordCredentialsProviderDefImpl extends CredentialsProviderDefImpl implements
@@ -39,9 +39,9 @@ public class PasswordCredentialsProviderDefImpl extends CredentialsProviderDefIm
 {
 
   /**
-   * The default value of the '{@link #getPassword() <em>Password</em>}' attribute. <!-- begin-user-doc --> <!--
+   * The default value of the '{@link #getPassword() <em>Password</em>}' attribute.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getPassword()
    * @generated
    * @ordered
@@ -49,9 +49,9 @@ public class PasswordCredentialsProviderDefImpl extends CredentialsProviderDefIm
   protected static final String PASSWORD_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getPassword() <em>Password</em>}' attribute. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getPassword() <em>Password</em>}' attribute.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getPassword()
    * @generated
    * @ordered
@@ -60,7 +60,6 @@ public class PasswordCredentialsProviderDefImpl extends CredentialsProviderDefIm
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected PasswordCredentialsProviderDefImpl()
@@ -70,7 +69,6 @@ public class PasswordCredentialsProviderDefImpl extends CredentialsProviderDefIm
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -81,7 +79,6 @@ public class PasswordCredentialsProviderDefImpl extends CredentialsProviderDefIm
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getPassword()
@@ -91,7 +88,6 @@ public class PasswordCredentialsProviderDefImpl extends CredentialsProviderDefIm
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setPassword(String newPassword)
@@ -99,15 +95,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -123,7 +116,6 @@ public class PasswordCredentialsProviderDefImpl extends CredentialsProviderDefIm
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -140,7 +132,6 @@ public class PasswordCredentialsProviderDefImpl extends CredentialsProviderDefIm
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -157,7 +148,6 @@ public class PasswordCredentialsProviderDefImpl extends CredentialsProviderDefIm
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -173,16 +163,13 @@ public class PasswordCredentialsProviderDefImpl extends CredentialsProviderDefIm
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
   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 598ddc2091..259da4535d 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
@@ -24,20 +24,20 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.net4j.util.defs.impl.RandomizerDefImpl#getAlgorithmName <em>Algorithm Name</em>}</li>
- * <li>{@link org.eclipse.net4j.util.defs.impl.RandomizerDefImpl#getProviderName <em>Provider Name</em>}</li>
- * <li>{@link org.eclipse.net4j.util.defs.impl.RandomizerDefImpl#getSeed <em>Seed</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.impl.RandomizerDefImpl#getAlgorithmName <em>Algorithm Name</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.impl.RandomizerDefImpl#getProviderName <em>Provider Name</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.impl.RandomizerDefImpl#getSeed <em>Seed</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class RandomizerDefImpl extends DefImpl implements RandomizerDef
 {
   /**
-   * The default value of the '{@link #getAlgorithmName() <em>Algorithm Name</em>}' attribute. <!-- begin-user-doc -->
+   * The default value of the '{@link #getAlgorithmName() <em>Algorithm Name</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @see #getAlgorithmName()
    * @generated
    * @ordered
@@ -45,9 +45,9 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
   protected static final String ALGORITHM_NAME_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getAlgorithmName() <em>Algorithm Name</em>}' attribute. <!-- begin-user-doc -->
+   * The cached value of the '{@link #getAlgorithmName() <em>Algorithm Name</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @see #getAlgorithmName()
    * @generated
    * @ordered
@@ -55,17 +55,17 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
   protected String algorithmName = ALGORITHM_NAME_EDEFAULT;
 
   /**
-   * This is true if the Algorithm Name attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This is true if the Algorithm Name attribute has been set.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   protected boolean algorithmNameESet;
 
   /**
-   * The default value of the '{@link #getProviderName() <em>Provider Name</em>}' attribute. <!-- begin-user-doc -->
+   * The default value of the '{@link #getProviderName() <em>Provider Name</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @see #getProviderName()
    * @generated
    * @ordered
@@ -73,9 +73,9 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
   protected static final String PROVIDER_NAME_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getProviderName() <em>Provider Name</em>}' attribute. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getProviderName() <em>Provider Name</em>}' attribute.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getProviderName()
    * @generated
    * @ordered
@@ -83,8 +83,8 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
   protected String providerName = PROVIDER_NAME_EDEFAULT;
 
   /**
-   * This is true if the Provider Name attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This is true if the Provider Name attribute has been set.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -101,8 +101,8 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
   protected static final byte[] SEED_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getSeed() <em>Seed</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The cached value of the '{@link #getSeed() <em>Seed</em>}' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #getSeed()
    * @generated
    * @ordered
@@ -110,8 +110,8 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
   protected byte[] seed = SEED_EDEFAULT;
 
   /**
-   * This is true if the Seed attribute has been set. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This is true if the Seed attribute has been set.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -138,7 +138,6 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected RandomizerDefImpl()
@@ -148,7 +147,6 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -159,7 +157,6 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getAlgorithmName()
@@ -169,7 +166,6 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setAlgorithmName(String newAlgorithmName)
@@ -179,15 +175,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void unsetAlgorithmName()
@@ -197,15 +190,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public boolean isSetAlgorithmName()
@@ -215,7 +205,6 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getProviderName()
@@ -225,7 +214,6 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setProviderName(String newProviderName)
@@ -235,15 +223,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void unsetProviderName()
@@ -253,15 +238,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public boolean isSetProviderName()
@@ -271,7 +253,6 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public byte[] getSeed()
@@ -281,7 +262,6 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setSeed(byte[] newSeed)
@@ -291,15 +271,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void unsetSeed()
@@ -309,15 +286,12 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public boolean isSetSeed()
@@ -327,7 +301,6 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -347,7 +320,6 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -370,7 +342,6 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -393,7 +364,6 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -413,45 +383,30 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
   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 574b5f96f2..4171f10b9b 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
@@ -28,11 +28,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.net4j.util.defs.impl.ResponseNegotiatorDefImpl#getCredentialsProvider <em>Credentials Provider
- * </em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.impl.ResponseNegotiatorDefImpl#getCredentialsProvider <em>Credentials Provider</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class ResponseNegotiatorDefImpl extends NegotiatorDefImpl implements ResponseNegotiatorDef
@@ -49,7 +48,6 @@ public class ResponseNegotiatorDefImpl extends NegotiatorDefImpl implements Resp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected ResponseNegotiatorDefImpl()
@@ -59,7 +57,6 @@ public class ResponseNegotiatorDefImpl extends NegotiatorDefImpl implements Resp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -70,7 +67,6 @@ public class ResponseNegotiatorDefImpl extends NegotiatorDefImpl implements Resp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CredentialsProviderDef getCredentialsProvider()
@@ -82,11 +78,9 @@ 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;
@@ -94,7 +88,6 @@ public class ResponseNegotiatorDefImpl extends NegotiatorDefImpl implements Resp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CredentialsProviderDef basicGetCredentialsProvider()
@@ -104,7 +97,6 @@ public class ResponseNegotiatorDefImpl extends NegotiatorDefImpl implements Resp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setCredentialsProvider(CredentialsProviderDef newCredentialsProvider)
@@ -112,16 +104,13 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -131,9 +120,7 @@ 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);
@@ -141,7 +128,6 @@ public class ResponseNegotiatorDefImpl extends NegotiatorDefImpl implements Resp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -158,7 +144,6 @@ public class ResponseNegotiatorDefImpl extends NegotiatorDefImpl implements Resp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -175,7 +160,6 @@ public class ResponseNegotiatorDefImpl extends NegotiatorDefImpl implements Resp
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
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 209a7823c8..b2886d60ae 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
@@ -35,7 +35,6 @@ public class ThreadPoolDefImpl extends ExecutorServiceDefImpl implements ThreadP
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected ThreadPoolDefImpl()
@@ -45,7 +44,6 @@ public class ThreadPoolDefImpl extends ExecutorServiceDefImpl implements ThreadP
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
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 1f8471ceed..4330b0b8fa 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
@@ -24,19 +24,19 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.net4j.util.defs.impl.UserImpl#getUserID <em>User ID</em>}</li>
- * <li>{@link org.eclipse.net4j.util.defs.impl.UserImpl#getPassword <em>Password</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.impl.UserImpl#getUserID <em>User ID</em>}</li>
+ *   <li>{@link org.eclipse.net4j.util.defs.impl.UserImpl#getPassword <em>Password</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class UserImpl extends EObjectImpl implements User
 {
   /**
-   * The default value of the '{@link #getUserID() <em>User ID</em>}' attribute. <!-- begin-user-doc --> <!--
+   * The default value of the '{@link #getUserID() <em>User ID</em>}' attribute.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getUserID()
    * @generated
    * @ordered
@@ -44,9 +44,9 @@ public class UserImpl extends EObjectImpl implements User
   protected static final String USER_ID_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getUserID() <em>User ID</em>}' attribute. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getUserID() <em>User ID</em>}' attribute.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getUserID()
    * @generated
    * @ordered
@@ -54,9 +54,9 @@ public class UserImpl extends EObjectImpl implements User
   protected String userID = USER_ID_EDEFAULT;
 
   /**
-   * The default value of the '{@link #getPassword() <em>Password</em>}' attribute. <!-- begin-user-doc --> <!--
+   * The default value of the '{@link #getPassword() <em>Password</em>}' attribute.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getPassword()
    * @generated
    * @ordered
@@ -64,9 +64,9 @@ public class UserImpl extends EObjectImpl implements User
   protected static final String PASSWORD_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getPassword() <em>Password</em>}' attribute. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getPassword() <em>Password</em>}' attribute.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getPassword()
    * @generated
    * @ordered
@@ -75,7 +75,6 @@ public class UserImpl extends EObjectImpl implements User
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected UserImpl()
@@ -85,7 +84,6 @@ public class UserImpl extends EObjectImpl implements User
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -96,7 +94,6 @@ public class UserImpl extends EObjectImpl implements User
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getUserID()
@@ -106,7 +103,6 @@ public class UserImpl extends EObjectImpl implements User
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setUserID(String newUserID)
@@ -114,14 +110,11 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getPassword()
@@ -131,7 +124,6 @@ public class UserImpl extends EObjectImpl implements User
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setPassword(String newPassword)
@@ -139,14 +131,11 @@ 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));
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -164,7 +153,6 @@ public class UserImpl extends EObjectImpl implements User
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -184,7 +172,6 @@ public class UserImpl extends EObjectImpl implements User
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -204,7 +191,6 @@ public class UserImpl extends EObjectImpl implements User
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -222,16 +208,13 @@ public class UserImpl extends EObjectImpl implements User
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
   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 368cee2616..ae625bead9 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
@@ -38,9 +38,9 @@ import java.util.Collection;
 public class UserManagerDefImpl extends DefImpl implements UserManagerDef
 {
   /**
-   * The cached value of the '{@link #getUser() <em>User</em>}' reference list. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getUser() <em>User</em>}' reference list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getUser()
    * @generated
    * @ordered
@@ -49,7 +49,6 @@ public class UserManagerDefImpl extends DefImpl implements UserManagerDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected UserManagerDefImpl()
@@ -59,7 +58,6 @@ public class UserManagerDefImpl extends DefImpl implements UserManagerDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -70,7 +68,6 @@ public class UserManagerDefImpl extends DefImpl implements UserManagerDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EList<User> getUser()
@@ -84,20 +81,16 @@ public class UserManagerDefImpl extends DefImpl implements UserManagerDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void unsetUser()
   {
     if (user != null)
-    {
       ((InternalEList.Unsettable<?>)user).unset();
-    }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public boolean isSetUser()
@@ -107,7 +100,6 @@ public class UserManagerDefImpl extends DefImpl implements UserManagerDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -123,7 +115,6 @@ public class UserManagerDefImpl extends DefImpl implements UserManagerDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -142,7 +133,6 @@ public class UserManagerDefImpl extends DefImpl implements UserManagerDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -159,7 +149,6 @@ public class UserManagerDefImpl extends DefImpl implements UserManagerDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsAdapterFactory.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsAdapterFactory.java
index 365c85e586..c496b44ee4 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsAdapterFactory.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsAdapterFactory.java
@@ -33,22 +33,21 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
  * method for each class of the model. <!-- end-user-doc -->
- * 
  * @see org.eclipse.net4j.util.defs.Net4jUtilDefsPackage
  * @generated
  */
 public class Net4jUtilDefsAdapterFactory extends AdapterFactoryImpl
 {
   /**
-   * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The cached model package.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected static Net4jUtilDefsPackage modelPackage;
 
   /**
-   * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates an instance of the adapter factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public Net4jUtilDefsAdapterFactory()
@@ -60,10 +59,10 @@ public class Net4jUtilDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
+   * Returns whether this factory is applicable for the type of the object.
+   * <!-- begin-user-doc --> This implementation
    * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
    * end-user-doc -->
-   * 
    * @return whether this factory is applicable for the type of the object.
    * @generated
    */
@@ -82,8 +81,8 @@ public class Net4jUtilDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The switch that delegates to the <code>createXXX</code> methods.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected Net4jUtilDefsSwitch<Adapter> modelSwitch = new Net4jUtilDefsSwitch<Adapter>()
@@ -168,10 +167,9 @@ public class Net4jUtilDefsAdapterFactory extends AdapterFactoryImpl
   };
 
   /**
-   * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param target
-   *          the object to adapt.
+   * Creates an adapter for the <code>target</code>.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param target the object to adapt.
    * @return the adapter for the <code>target</code>.
    * @generated
    */
@@ -182,10 +180,9 @@ public class Net4jUtilDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.DefContainer
-   * <em>Def Container</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.DefContainer <em>Def Container</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.DefContainer
    * @generated
@@ -210,11 +207,10 @@ public class Net4jUtilDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.ExecutorServiceDef
-   * <em>Executor Service Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.ExecutorServiceDef <em>Executor Service 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.ExecutorServiceDef
    * @generated
@@ -225,10 +221,9 @@ public class Net4jUtilDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.ThreadPoolDef
-   * <em>Thread Pool Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.ThreadPoolDef <em>Thread Pool 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.ThreadPoolDef
    * @generated
@@ -239,10 +234,9 @@ public class Net4jUtilDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.RandomizerDef
-   * <em>Randomizer Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.RandomizerDef <em>Randomizer 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.RandomizerDef
    * @generated
@@ -253,10 +247,9 @@ public class Net4jUtilDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.UserManagerDef
-   * <em>User Manager Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.UserManagerDef <em>User Manager 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.UserManagerDef
    * @generated
@@ -281,11 +274,10 @@ public class Net4jUtilDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.PasswordCredentialsProviderDef
-   * <em>Password Credentials Provider Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.PasswordCredentialsProviderDef <em>Password Credentials Provider 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.PasswordCredentialsProviderDef
    * @generated
@@ -296,11 +288,10 @@ public class Net4jUtilDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.CredentialsProviderDef
-   * <em>Credentials Provider Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.CredentialsProviderDef <em>Credentials Provider 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.CredentialsProviderDef
    * @generated
@@ -311,10 +302,9 @@ public class Net4jUtilDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.NegotiatorDef
-   * <em>Negotiator Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.NegotiatorDef <em>Negotiator 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.NegotiatorDef
    * @generated
@@ -325,11 +315,10 @@ public class Net4jUtilDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.ResponseNegotiatorDef
-   * <em>Response Negotiator Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.ResponseNegotiatorDef <em>Response Negotiator 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.ResponseNegotiatorDef
    * @generated
@@ -340,11 +329,10 @@ public class Net4jUtilDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.ChallengeNegotiatorDef
-   * <em>Challenge Negotiator Def</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.ChallengeNegotiatorDef <em>Challenge Negotiator 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.ChallengeNegotiatorDef
    * @generated
@@ -355,9 +343,9 @@ public class Net4jUtilDefsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
+   * Creates a new adapter for the default case.
+   * <!-- begin-user-doc --> This default implementation returns null. <!--
    * end-user-doc -->
-   * 
    * @return the new adapter.
    * @generated
    */
diff --git a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java
index af63cea701..82496400d1 100644
--- a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java
+++ b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessDayItemProvider.java
@@ -37,17 +37,17 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * This is the item provider adapter for a {@link org.gastro.business.BusinessDay} object. <!-- begin-user-doc --> <!--
+ * This is the item provider adapter for a {@link org.gastro.business.BusinessDay} object.
+ * <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
  * @generated
  */
 public class BusinessDayItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
     IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
-   * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This constructs an instance from a factory and a notifier.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public BusinessDayItemProvider(AdapterFactory adapterFactory)
@@ -56,8 +56,8 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
   }
 
   /**
-   * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This returns the property descriptors for the adapted class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   @Override
@@ -75,8 +75,8 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
   }
 
   /**
-   * This adds a property descriptor for the Date feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This adds a property descriptor for the Date feature.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected void addDatePropertyDescriptor(Object object)
@@ -90,8 +90,8 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
   }
 
   /**
-   * This adds a property descriptor for the Menu Card feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This adds a property descriptor for the Menu Card feature.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected void addMenuCardPropertyDescriptor(Object object)
@@ -104,8 +104,8 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
   }
 
   /**
-   * This adds a property descriptor for the Closed feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This adds a property descriptor for the Closed feature.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected void addClosedPropertyDescriptor(Object object)
@@ -121,9 +121,9 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
   /**
    * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
    * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-   * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+   * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -140,7 +140,6 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -154,7 +153,6 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -164,8 +162,8 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
   }
 
   /**
-   * This returns BusinessDay.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This returns BusinessDay.gif.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   @Override
@@ -176,7 +174,6 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -199,9 +196,9 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
   }
 
   /**
-   * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
-   * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This handles model notifications by calling {@link #updateChildren} to update any cached
+   * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   @Override
@@ -224,9 +221,9 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
   }
 
   /**
-   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
-   * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+   * that can be created under this object.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   @Override
@@ -242,8 +239,8 @@ public class BusinessDayItemProvider extends ItemProviderAdapter implements IEdi
   }
 
   /**
-   * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Return the resource locator for this item provider's resources.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   @Override
diff --git a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessEditPlugin.java b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessEditPlugin.java
index 32cdec88be..ee0e2d6637 100644
--- a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessEditPlugin.java
+++ b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessEditPlugin.java
@@ -19,29 +19,29 @@ import org.eclipse.emf.common.util.ResourceLocator;
 import org.gastro.inventory.provider.InventoryEditPlugin;
 
 /**
- * This is the central singleton for the Business edit plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
+ * This is the central singleton for the Business edit plugin.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
  * @generated
  */
 public final class BusinessEditPlugin extends EMFPlugin
 {
   /**
-   * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Keep track of the singleton.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public static final BusinessEditPlugin INSTANCE = new BusinessEditPlugin();
 
   /**
-   * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Keep track of the singleton.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   private static Implementation plugin;
 
   /**
-   * Create the instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Create the instance.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public BusinessEditPlugin()
@@ -50,8 +50,8 @@ public final class BusinessEditPlugin extends EMFPlugin
   }
 
   /**
-   * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the singleton instance of the Eclipse plugin.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the singleton instance.
    * @generated
    */
@@ -62,8 +62,8 @@ public final class BusinessEditPlugin extends EMFPlugin
   }
 
   /**
-   * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the singleton instance of the Eclipse plugin.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the singleton instance.
    * @generated
    */
@@ -73,15 +73,15 @@ public final class BusinessEditPlugin extends EMFPlugin
   }
 
   /**
-   * The actual implementation of the Eclipse <b>Plugin</b>. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The actual implementation of the Eclipse <b>Plugin</b>.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public static class Implementation extends EclipsePlugin
   {
     /**
-     * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
+     * Creates an instance.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     public Implementation()
diff --git a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java
index ad0ea5900d..8ec8df10df 100644
--- a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java
+++ b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/BusinessItemProviderAdapterFactory.java
@@ -45,17 +45,17 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
     IChangeNotifier, IDisposable
 {
   /**
-   * This keeps track of the root adapter factory that delegates to this adapter factory. <!-- begin-user-doc --> <!--
+   * This keeps track of the root adapter factory that delegates to this adapter factory.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    */
   protected ComposedAdapterFactory parentAdapterFactory;
 
   /**
-   * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!-- begin-user-doc --> <!--
+   * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    */
   protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -69,8 +69,8 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
   protected Collection<Object> supportedTypes = new ArrayList<Object>();
 
   /**
-   * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This constructs an instance.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public BusinessItemProviderAdapterFactory()
@@ -108,16 +108,16 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
   }
 
   /**
-   * This keeps track of the one adapter used for all {@link org.gastro.business.Order} instances. <!-- begin-user-doc
+   * This keeps track of the one adapter used for all {@link org.gastro.business.Order} instances.
+   * <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected OrderItemProvider orderItemProvider;
 
   /**
-   * This creates an adapter for a {@link org.gastro.business.Order}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This creates an adapter for a {@link org.gastro.business.Order}.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   @Override
@@ -157,16 +157,16 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
   }
 
   /**
-   * This keeps track of the one adapter used for all {@link org.gastro.business.Waiter} instances. <!-- begin-user-doc
+   * This keeps track of the one adapter used for all {@link org.gastro.business.Waiter} instances.
+   * <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected WaiterItemProvider waiterItemProvider;
 
   /**
-   * This creates an adapter for a {@link org.gastro.business.Waiter}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This creates an adapter for a {@link org.gastro.business.Waiter}.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   @Override
@@ -181,8 +181,8 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
   }
 
   /**
-   * This returns the root adapter factory that contains this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This returns the root adapter factory that contains this factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public ComposeableAdapterFactory getRootAdapterFactory()
@@ -191,8 +191,8 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
   }
 
   /**
-   * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This sets the composed adapter factory that contains this factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory)
@@ -202,7 +202,6 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -212,9 +211,9 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
   }
 
   /**
-   * This implementation substitutes the factory itself as the key for the adapter. <!-- begin-user-doc --> <!--
+   * This implementation substitutes the factory itself as the key for the adapter.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -225,7 +224,6 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -234,7 +232,7 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
     if (isFactoryForType(type))
     {
       Object adapter = super.adapt(object, type);
-      if (!(type instanceof Class<?>) || ((Class<?>)type).isInstance(adapter))
+      if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter)))
       {
         return adapter;
       }
@@ -244,8 +242,8 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
   }
 
   /**
-   * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This adds a listener.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public void addListener(INotifyChangedListener notifyChangedListener)
@@ -254,8 +252,8 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
   }
 
   /**
-   * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This removes a listener.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public void removeListener(INotifyChangedListener notifyChangedListener)
@@ -264,9 +262,9 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
   }
 
   /**
-   * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!--
+   * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    */
   public void fireNotifyChanged(Notification notification)
@@ -280,28 +278,20 @@ public class BusinessItemProviderAdapterFactory extends BusinessAdapterFactory i
   }
 
   /**
-   * This disposes all of the item providers created by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This disposes all of the item providers created by this factory. 
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public void dispose()
   {
     if (businessDayItemProvider != null)
-    {
       businessDayItemProvider.dispose();
-    }
     if (orderItemProvider != null)
-    {
       orderItemProvider.dispose();
-    }
     if (orderDetailItemProvider != null)
-    {
       orderDetailItemProvider.dispose();
-    }
     if (waiterItemProvider != null)
-    {
       waiterItemProvider.dispose();
-    }
   }
 
 }
diff --git a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java
index cbb99b11a3..1487b76023 100644
--- a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java
+++ b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderDetailItemProvider.java
@@ -34,17 +34,17 @@ import java.util.Collection;
 import java.util.List;
 
 /**
- * This is the item provider adapter for a {@link org.gastro.business.OrderDetail} object. <!-- begin-user-doc --> <!--
+ * This is the item provider adapter for a {@link org.gastro.business.OrderDetail} object.
+ * <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
  * @generated
  */
 public class OrderDetailItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
     IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
-   * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This constructs an instance from a factory and a notifier.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public OrderDetailItemProvider(AdapterFactory adapterFactory)
@@ -53,8 +53,8 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
   }
 
   /**
-   * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This returns the property descriptors for the adapted class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   @Override
@@ -73,8 +73,8 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
   }
 
   /**
-   * This adds a property descriptor for the Offering feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This adds a property descriptor for the Offering feature.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected void addOfferingPropertyDescriptor(Object object)
@@ -87,8 +87,8 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
   }
 
   /**
-   * This adds a property descriptor for the Quantity feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This adds a property descriptor for the Quantity feature.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected void addQuantityPropertyDescriptor(Object object)
@@ -102,8 +102,8 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
   }
 
   /**
-   * This adds a property descriptor for the State feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This adds a property descriptor for the State feature.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected void addStatePropertyDescriptor(Object object)
@@ -117,8 +117,8 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
   }
 
   /**
-   * This adds a property descriptor for the Price feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This adds a property descriptor for the Price feature.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected void addPricePropertyDescriptor(Object object)
@@ -133,7 +133,6 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -143,8 +142,8 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
   }
 
   /**
-   * This returns OrderDetail.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This returns OrderDetail.gif.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   @Override
@@ -155,7 +154,6 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -178,9 +176,9 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
   }
 
   /**
-   * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
-   * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This handles model notifications by calling {@link #updateChildren} to update any cached
+   * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   @Override
@@ -200,9 +198,9 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
   }
 
   /**
-   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
-   * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+   * that can be created under this object.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   @Override
@@ -212,8 +210,8 @@ public class OrderDetailItemProvider extends ItemProviderAdapter implements IEdi
   }
 
   /**
-   * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Return the resource locator for this item provider's resources.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   @Override
diff --git a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java
index a4d61d21a6..9bba43a7fe 100644
--- a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java
+++ b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/OrderItemProvider.java
@@ -36,17 +36,17 @@ import java.util.Collection;
 import java.util.List;
 
 /**
- * This is the item provider adapter for a {@link org.gastro.business.Order} object. <!-- begin-user-doc --> <!--
+ * This is the item provider adapter for a {@link org.gastro.business.Order} object.
+ * <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
  * @generated
  */
 public class OrderItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
     IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
-   * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This constructs an instance from a factory and a notifier.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public OrderItemProvider(AdapterFactory adapterFactory)
@@ -55,8 +55,8 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
   }
 
   /**
-   * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This returns the property descriptors for the adapted class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   @Override
@@ -73,8 +73,8 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
   }
 
   /**
-   * This adds a property descriptor for the Table feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This adds a property descriptor for the Table feature.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected void addTablePropertyDescriptor(Object object)
@@ -87,8 +87,8 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
   }
 
   /**
-   * This adds a property descriptor for the Number feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This adds a property descriptor for the Number feature.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected void addNumberPropertyDescriptor(Object object)
@@ -104,9 +104,9 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
   /**
    * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
    * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-   * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+   * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -122,7 +122,6 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -136,7 +135,6 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -146,8 +144,8 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
   }
 
   /**
-   * This returns Order.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This returns Order.gif.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   @Override
@@ -158,7 +156,6 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -168,8 +165,8 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
   }
 
   /**
-   * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This returns the label text for the adapted class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   @Override
@@ -180,9 +177,9 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
   }
 
   /**
-   * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
-   * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This handles model notifications by calling {@link #updateChildren} to update any cached
+   * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   @Override
@@ -203,9 +200,9 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
   }
 
   /**
-   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
-   * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+   * that can be created under this object.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   @Override
@@ -218,8 +215,8 @@ public class OrderItemProvider extends ItemProviderAdapter implements IEditingDo
   }
 
   /**
-   * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Return the resource locator for this item provider's resources.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   @Override
diff --git a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java
index 714479c152..eafc96c40a 100644
--- a/plugins/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java
+++ b/plugins/org.gastro.business.edit/src/org/gastro/business/provider/WaiterItemProvider.java
@@ -34,17 +34,17 @@ import java.util.Collection;
 import java.util.List;
 
 /**
- * This is the item provider adapter for a {@link org.gastro.business.Waiter} object. <!-- begin-user-doc --> <!--
+ * This is the item provider adapter for a {@link org.gastro.business.Waiter} object.
+ * <!-- begin-user-doc --> <!--
  * end-user-doc -->
- * 
  * @generated
  */
 public class WaiterItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
     IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
-   * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This constructs an instance from a factory and a notifier.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public WaiterItemProvider(AdapterFactory adapterFactory)
@@ -53,8 +53,8 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
   }
 
   /**
-   * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This returns the property descriptors for the adapted class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   @Override
@@ -73,8 +73,8 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
   }
 
   /**
-   * This adds a property descriptor for the Tables feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This adds a property descriptor for the Tables feature.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected void addTablesPropertyDescriptor(Object object)
@@ -87,8 +87,8 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
   }
 
   /**
-   * This adds a property descriptor for the Employee feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This adds a property descriptor for the Employee feature.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected void addEmployeePropertyDescriptor(Object object)
@@ -101,8 +101,8 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
   }
 
   /**
-   * This adds a property descriptor for the From feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This adds a property descriptor for the From feature.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected void addFromPropertyDescriptor(Object object)
@@ -116,8 +116,8 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
   }
 
   /**
-   * This adds a property descriptor for the Until feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This adds a property descriptor for the Until feature.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected void addUntilPropertyDescriptor(Object object)
@@ -132,7 +132,6 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -142,8 +141,8 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
   }
 
   /**
-   * This returns Waiter.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This returns Waiter.gif.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   @Override
@@ -154,7 +153,6 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -176,9 +174,9 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
   }
 
   /**
-   * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating a
-   * viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This handles model notifications by calling {@link #updateChildren} to update any cached
+   * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   @Override
@@ -197,9 +195,9 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
   }
 
   /**
-   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
-   * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+   * that can be created under this object.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   @Override
@@ -209,8 +207,8 @@ public class WaiterItemProvider extends ItemProviderAdapter implements IEditingD
   }
 
   /**
-   * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Return the resource locator for this item provider's resources.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   @Override
diff --git a/plugins/org.gastro.business/model/business.genmodel b/plugins/org.gastro.business/model/business.genmodel
index 60e7fa6f6b..972e6bce04 100644
--- a/plugins/org.gastro.business/model/business.genmodel
+++ b/plugins/org.gastro.business/model/business.genmodel
@@ -1,41 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.gastro.business/src"
-    creationIcons="false" editorDirectory="" modelPluginID="org.gastro.business" modelName="Business"
-    rootExtendsInterface="org.eclipse.emf.cdo.CDOObject" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
-    reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo"
-    featureDelegation="Reflective" complianceLevel="5.0" copyrightFields="false" optimizedHasChildren="true"
-    usedGenPackages="../../org.gastro.inventory/model/inventory.genmodel#//inventory">
-  <foreignModel>business.ecore</foreignModel>
-  <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
-  <genPackages prefix="Business" basePackage="org.gastro" disposableProviderFactory="true"
-      ecorePackage="business.ecore#/">
-    <genClasses ecoreClass="business.ecore#//BusinessDay">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute business.ecore#//BusinessDay/date"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference business.ecore#//BusinessDay/menuCard"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference business.ecore#//BusinessDay/orders"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference business.ecore#//BusinessDay/waiters"/>
-    </genClasses>
-    <genClasses ecoreClass="business.ecore#//Order">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference business.ecore#//Order/businessDay"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference business.ecore#//Order/table"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference business.ecore#//Order/orderDetails"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute business.ecore#//Order/number"/>
-    </genClasses>
-    <genClasses ecoreClass="business.ecore#//OrderDetail">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference business.ecore#//OrderDetail/order"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference business.ecore#//OrderDetail/offering"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute business.ecore#//OrderDetail/quantity"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute business.ecore#//OrderDetail/prepared"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute business.ecore#//OrderDetail/served"/>
-    </genClasses>
-    <genClasses ecoreClass="business.ecore#//Waiter">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference business.ecore#//Waiter/businessDay"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference business.ecore#//Waiter/tables"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference business.ecore#//Waiter/employee"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute business.ecore#//Waiter/from"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute business.ecore#//Waiter/until"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.gastro.business/src"
+    creationIcons="false" editorDirectory="" modelPluginID="org.gastro.business" modelName="Business"
+    rootExtendsInterface="org.eclipse.emf.cdo.CDOObject" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
+    reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo"
+    featureDelegation="Reflective" complianceLevel="5.0" copyrightFields="false" optimizedHasChildren="true"
+    runtimeVersion="2.6" usedGenPackages="../../org.gastro.inventory/model/inventory.genmodel#//inventory">
+  <foreignModel>business.ecore</foreignModel>
+  <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
+  <genPackages prefix="Business" basePackage="org.gastro" disposableProviderFactory="true"
+      ecorePackage="business.ecore#/">
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="business.ecore#//OrderState">
+      <genEnumLiterals ecoreEnumLiteral="business.ecore#//OrderState/Ordered"/>
+      <genEnumLiterals ecoreEnumLiteral="business.ecore#//OrderState/Acknowledged"/>
+      <genEnumLiterals ecoreEnumLiteral="business.ecore#//OrderState/Prepared"/>
+      <genEnumLiterals ecoreEnumLiteral="business.ecore#//OrderState/Served"/>
+      <genEnumLiterals ecoreEnumLiteral="business.ecore#//OrderState/Paid"/>
+    </genEnums>
+    <genClasses ecoreClass="business.ecore#//BusinessDay">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute business.ecore#//BusinessDay/date"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference business.ecore#//BusinessDay/menuCard"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference business.ecore#//BusinessDay/orders"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference business.ecore#//BusinessDay/waiters"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute business.ecore#//BusinessDay/closed"/>
+    </genClasses>
+    <genClasses ecoreClass="business.ecore#//Order">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference business.ecore#//Order/businessDay"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference business.ecore#//Order/table"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference business.ecore#//Order/orderDetails"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute business.ecore#//Order/number"/>
+    </genClasses>
+    <genClasses ecoreClass="business.ecore#//OrderDetail">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference business.ecore#//OrderDetail/order"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference business.ecore#//OrderDetail/offering"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute business.ecore#//OrderDetail/quantity"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute business.ecore#//OrderDetail/state"/>
+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute business.ecore#//OrderDetail/price"/>
+    </genClasses>
+    <genClasses ecoreClass="business.ecore#//Waiter">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference business.ecore#//Waiter/businessDay"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference business.ecore#//Waiter/tables"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference business.ecore#//Waiter/employee"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute business.ecore#//Waiter/from"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute business.ecore#//Waiter/until"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/org.gastro.business/src/org/gastro/business/BusinessDay.java b/plugins/org.gastro.business/src/org/gastro/business/BusinessDay.java
index 3730c1cdf7..95077020f1 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/BusinessDay.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/BusinessDay.java
@@ -23,17 +23,18 @@ import java.util.Date;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Day</b></em>'. <!-- end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.gastro.business.BusinessDay#getDate <em>Date</em>}</li>
- * <li>{@link org.gastro.business.BusinessDay#getMenuCard <em>Menu Card</em>}</li>
- * <li>{@link org.gastro.business.BusinessDay#getOrders <em>Orders</em>}</li>
- * <li>{@link org.gastro.business.BusinessDay#getWaiters <em>Waiters</em>}</li>
- * <li>{@link org.gastro.business.BusinessDay#isClosed <em>Closed</em>}</li>
+ *   <li>{@link org.gastro.business.BusinessDay#getDate <em>Date</em>}</li>
+ *   <li>{@link org.gastro.business.BusinessDay#getMenuCard <em>Menu Card</em>}</li>
+ *   <li>{@link org.gastro.business.BusinessDay#getOrders <em>Orders</em>}</li>
+ *   <li>{@link org.gastro.business.BusinessDay#getWaiters <em>Waiters</em>}</li>
+ *   <li>{@link org.gastro.business.BusinessDay#isClosed <em>Closed</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.business.BusinessPackage#getBusinessDay()
  * @model
  * @extends CDOObject
@@ -42,12 +43,12 @@ import java.util.Date;
 public interface BusinessDay extends CDOObject
 {
   /**
-   * Returns the value of the '<em><b>Date</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Date</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Date</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Date</em>' attribute.
    * @see #setDate(Date)
    * @see org.gastro.business.BusinessPackage#getBusinessDay_Date()
@@ -68,13 +69,13 @@ public interface BusinessDay extends CDOObject
   void setDate(Date value);
 
   /**
-   * Returns the value of the '<em><b>Menu Card</b></em>' reference. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Menu Card</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Menu Card</em>' reference isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Menu Card</em>' reference.
    * @see #setMenuCard(MenuCard)
    * @see org.gastro.business.BusinessPackage#getBusinessDay_MenuCard()
@@ -95,15 +96,15 @@ public interface BusinessDay extends CDOObject
   void setMenuCard(MenuCard value);
 
   /**
-   * Returns the value of the '<em><b>Orders</b></em>' containment reference list. The list contents are of type
-   * {@link org.gastro.business.Order}. It is bidirectional and its opposite is '
-   * {@link org.gastro.business.Order#getBusinessDay <em>Business Day</em>}'. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Orders</b></em>' containment reference list.
+   * The list contents are of type {@link org.gastro.business.Order}.
+   * It is bidirectional and its opposite is '{@link org.gastro.business.Order#getBusinessDay <em>Business Day</em>}'.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Orders</em>' containment reference list isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Orders</em>' containment reference list.
    * @see org.gastro.business.BusinessPackage#getBusinessDay_Orders()
    * @see org.gastro.business.Order#getBusinessDay
@@ -113,15 +114,15 @@ public interface BusinessDay extends CDOObject
   EList<Order> getOrders();
 
   /**
-   * Returns the value of the '<em><b>Waiters</b></em>' containment reference list. The list contents are of type
-   * {@link org.gastro.business.Waiter}. It is bidirectional and its opposite is '
-   * {@link org.gastro.business.Waiter#getBusinessDay <em>Business Day</em>}'. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Waiters</b></em>' containment reference list.
+   * The list contents are of type {@link org.gastro.business.Waiter}.
+   * It is bidirectional and its opposite is '{@link org.gastro.business.Waiter#getBusinessDay <em>Business Day</em>}'.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Waiters</em>' containment reference list isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Waiters</em>' containment reference list.
    * @see org.gastro.business.BusinessPackage#getBusinessDay_Waiters()
    * @see org.gastro.business.Waiter#getBusinessDay
@@ -131,12 +132,12 @@ public interface BusinessDay extends CDOObject
   EList<Waiter> getWaiters();
 
   /**
-   * Returns the value of the '<em><b>Closed</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Closed</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Closed</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Closed</em>' attribute.
    * @see #setClosed(boolean)
    * @see org.gastro.business.BusinessPackage#getBusinessDay_Closed()
diff --git a/plugins/org.gastro.business/src/org/gastro/business/BusinessFactory.java b/plugins/org.gastro.business/src/org/gastro/business/BusinessFactory.java
index 10bb42a44f..22a4e0cbc0 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/BusinessFactory.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/BusinessFactory.java
@@ -18,54 +18,53 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
  * the model. <!-- end-user-doc -->
- * 
  * @see org.gastro.business.BusinessPackage
  * @generated
  */
 public interface BusinessFactory extends EFactory
 {
   /**
-   * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The singleton instance of the factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   BusinessFactory eINSTANCE = org.gastro.business.impl.BusinessFactoryImpl.init();
 
   /**
-   * Returns a new object of class '<em>Day</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Day</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Day</em>'.
    * @generated
    */
   BusinessDay createBusinessDay();
 
   /**
-   * Returns a new object of class '<em>Order</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Order</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Order</em>'.
    * @generated
    */
   Order createOrder();
 
   /**
-   * Returns a new object of class '<em>Order Detail</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Order Detail</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Order Detail</em>'.
    * @generated
    */
   OrderDetail createOrderDetail();
 
   /**
-   * Returns a new object of class '<em>Waiter</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Waiter</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Waiter</em>'.
    * @generated
    */
   Waiter createWaiter();
 
   /**
-   * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the package supported by this factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the package supported by this factory.
    * @generated
    */
diff --git a/plugins/org.gastro.business/src/org/gastro/business/BusinessPackage.java b/plugins/org.gastro.business/src/org/gastro/business/BusinessPackage.java
index cc97dccaec..45cc229b46 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/BusinessPackage.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/BusinessPackage.java
@@ -28,7 +28,6 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * 
  * @see org.gastro.business.BusinessFactory
  * @model kind="package"
  * @generated
@@ -36,29 +35,29 @@ import org.eclipse.emf.ecore.EReference;
 public interface BusinessPackage extends EPackage
 {
   /**
-   * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The package name.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   String eNAME = "business";
 
   /**
-   * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The package namespace URI.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   String eNS_URI = "http://www.gastro.org/business/1.0";
 
   /**
-   * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The package namespace name.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   String eNS_PREFIX = "business";
 
   /**
-   * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The singleton instance of the package.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   BusinessPackage eINSTANCE = org.gastro.business.impl.BusinessPackageImpl.init();
@@ -74,59 +73,59 @@ public interface BusinessPackage extends EPackage
   int BUSINESS_DAY = 0;
 
   /**
-   * The feature id for the '<em><b>Date</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Date</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int BUSINESS_DAY__DATE = 0;
 
   /**
-   * The feature id for the '<em><b>Menu Card</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Menu Card</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int BUSINESS_DAY__MENU_CARD = 1;
 
   /**
-   * The feature id for the '<em><b>Orders</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Orders</b></em>' containment reference list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int BUSINESS_DAY__ORDERS = 2;
 
   /**
-   * The feature id for the '<em><b>Waiters</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Waiters</b></em>' containment reference list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int BUSINESS_DAY__WAITERS = 3;
 
   /**
-   * The feature id for the '<em><b>Closed</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Closed</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int BUSINESS_DAY__CLOSED = 4;
 
   /**
-   * The number of structural features of the '<em>Day</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The number of structural features of the '<em>Day</em>' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int BUSINESS_DAY_FEATURE_COUNT = 5;
 
   /**
-   * The meta object id for the '{@link org.gastro.business.impl.OrderImpl <em>Order</em>}' class. <!-- begin-user-doc
+   * The meta object id for the '{@link org.gastro.business.impl.OrderImpl <em>Order</em>}' class.
+   * <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
    * @see org.gastro.business.impl.OrderImpl
    * @see org.gastro.business.impl.BusinessPackageImpl#getOrder()
    * @generated
@@ -134,42 +133,42 @@ public interface BusinessPackage extends EPackage
   int ORDER = 1;
 
   /**
-   * The feature id for the '<em><b>Business Day</b></em>' container reference. <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Business Day</b></em>' container reference.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int ORDER__BUSINESS_DAY = 0;
 
   /**
-   * The feature id for the '<em><b>Table</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Table</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int ORDER__TABLE = 1;
 
   /**
-   * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Order Details</b></em>' containment reference list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int ORDER__ORDER_DETAILS = 2;
 
   /**
-   * The feature id for the '<em><b>Number</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Number</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int ORDER__NUMBER = 3;
 
   /**
-   * The number of structural features of the '<em>Order</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The number of structural features of the '<em>Order</em>' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -186,40 +185,40 @@ public interface BusinessPackage extends EPackage
   int ORDER_DETAIL = 2;
 
   /**
-   * The feature id for the '<em><b>Order</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Order</b></em>' container reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int ORDER_DETAIL__ORDER = 0;
 
   /**
-   * The feature id for the '<em><b>Offering</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Offering</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int ORDER_DETAIL__OFFERING = 1;
 
   /**
-   * The feature id for the '<em><b>Quantity</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Quantity</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int ORDER_DETAIL__QUANTITY = 2;
 
   /**
-   * The feature id for the '<em><b>State</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>State</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int ORDER_DETAIL__STATE = 3;
 
   /**
-   * The feature id for the '<em><b>Price</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Price</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -235,9 +234,9 @@ public interface BusinessPackage extends EPackage
   int ORDER_DETAIL_FEATURE_COUNT = 5;
 
   /**
-   * The meta object id for the '{@link org.gastro.business.impl.WaiterImpl <em>Waiter</em>}' class. <!-- begin-user-doc
+   * The meta object id for the '{@link org.gastro.business.impl.WaiterImpl <em>Waiter</em>}' class.
+   * <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
    * @see org.gastro.business.impl.WaiterImpl
    * @see org.gastro.business.impl.BusinessPackageImpl#getWaiter()
    * @generated
@@ -245,58 +244,58 @@ public interface BusinessPackage extends EPackage
   int WAITER = 3;
 
   /**
-   * The feature id for the '<em><b>Business Day</b></em>' container reference. <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Business Day</b></em>' container reference.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int WAITER__BUSINESS_DAY = 0;
 
   /**
-   * The feature id for the '<em><b>Tables</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Tables</b></em>' reference list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int WAITER__TABLES = 1;
 
   /**
-   * The feature id for the '<em><b>Employee</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Employee</b></em>' reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int WAITER__EMPLOYEE = 2;
 
   /**
-   * The feature id for the '<em><b>From</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>From</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int WAITER__FROM = 3;
 
   /**
-   * The feature id for the '<em><b>Until</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Until</b></em>' attribute.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int WAITER__UNTIL = 4;
 
   /**
-   * The number of structural features of the '<em>Waiter</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The number of structural features of the '<em>Waiter</em>' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int WAITER_FEATURE_COUNT = 5;
 
   /**
-   * The meta object id for the '{@link org.gastro.business.OrderState <em>Order State</em>}' enum. <!-- begin-user-doc
+   * The meta object id for the '{@link org.gastro.business.OrderState <em>Order State</em>}' enum.
+   * <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
    * @see org.gastro.business.OrderState
    * @see org.gastro.business.impl.BusinessPackageImpl#getOrderState()
    * @generated
@@ -304,9 +303,9 @@ public interface BusinessPackage extends EPackage
   int ORDER_STATE = 4;
 
   /**
-   * Returns the meta object for class '{@link org.gastro.business.BusinessDay <em>Day</em>}'. <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.gastro.business.BusinessDay <em>Day</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @return the meta object for class '<em>Day</em>'.
    * @see org.gastro.business.BusinessDay
    * @generated
@@ -327,7 +326,6 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for the reference '{@link org.gastro.business.BusinessDay#getMenuCard <em>Menu Card</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the reference '<em>Menu Card</em>'.
    * @see org.gastro.business.BusinessDay#getMenuCard()
    * @see #getBusinessDay()
@@ -336,9 +334,8 @@ public interface BusinessPackage extends EPackage
   EReference getBusinessDay_MenuCard();
 
   /**
-   * Returns the meta object for the containment reference list '{@link org.gastro.business.BusinessDay#getOrders
-   * <em>Orders</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the containment reference list '{@link org.gastro.business.BusinessDay#getOrders <em>Orders</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the containment reference list '<em>Orders</em>'.
    * @see org.gastro.business.BusinessDay#getOrders()
    * @see #getBusinessDay()
@@ -347,9 +344,8 @@ public interface BusinessPackage extends EPackage
   EReference getBusinessDay_Orders();
 
   /**
-   * Returns the meta object for the containment reference list '{@link org.gastro.business.BusinessDay#getWaiters
-   * <em>Waiters</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the containment reference list '{@link org.gastro.business.BusinessDay#getWaiters <em>Waiters</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the containment reference list '<em>Waiters</em>'.
    * @see org.gastro.business.BusinessDay#getWaiters()
    * @see #getBusinessDay()
@@ -369,9 +365,9 @@ public interface BusinessPackage extends EPackage
   EAttribute getBusinessDay_Closed();
 
   /**
-   * Returns the meta object for class '{@link org.gastro.business.Order <em>Order</em>}'. <!-- begin-user-doc --> <!--
+   * Returns the meta object for class '{@link org.gastro.business.Order <em>Order</em>}'.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @return the meta object for class '<em>Order</em>'.
    * @see org.gastro.business.Order
    * @generated
@@ -379,9 +375,8 @@ public interface BusinessPackage extends EPackage
   EClass getOrder();
 
   /**
-   * Returns the meta object for the container reference '{@link org.gastro.business.Order#getBusinessDay
-   * <em>Business Day</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the container reference '{@link org.gastro.business.Order#getBusinessDay <em>Business Day</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the container reference '<em>Business Day</em>'.
    * @see org.gastro.business.Order#getBusinessDay()
    * @see #getOrder()
@@ -401,9 +396,8 @@ public interface BusinessPackage extends EPackage
   EReference getOrder_Table();
 
   /**
-   * Returns the meta object for the containment reference list '{@link org.gastro.business.Order#getOrderDetails
-   * <em>Order Details</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the containment reference list '{@link org.gastro.business.Order#getOrderDetails <em>Order Details</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the containment reference list '<em>Order Details</em>'.
    * @see org.gastro.business.Order#getOrderDetails()
    * @see #getOrder()
@@ -433,9 +427,8 @@ public interface BusinessPackage extends EPackage
   EClass getOrderDetail();
 
   /**
-   * Returns the meta object for the container reference '{@link org.gastro.business.OrderDetail#getOrder
-   * <em>Order</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the container reference '{@link org.gastro.business.OrderDetail#getOrder <em>Order</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the container reference '<em>Order</em>'.
    * @see org.gastro.business.OrderDetail#getOrder()
    * @see #getOrderDetail()
@@ -446,7 +439,6 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for the reference '{@link org.gastro.business.OrderDetail#getOffering <em>Offering</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the reference '<em>Offering</em>'.
    * @see org.gastro.business.OrderDetail#getOffering()
    * @see #getOrderDetail()
@@ -457,7 +449,6 @@ public interface BusinessPackage extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.gastro.business.OrderDetail#getQuantity <em>Quantity</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute '<em>Quantity</em>'.
    * @see org.gastro.business.OrderDetail#getQuantity()
    * @see #getOrderDetail()
@@ -488,9 +479,9 @@ public interface BusinessPackage extends EPackage
   EAttribute getOrderDetail_Price();
 
   /**
-   * Returns the meta object for class '{@link org.gastro.business.Waiter <em>Waiter</em>}'. <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.gastro.business.Waiter <em>Waiter</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @return the meta object for class '<em>Waiter</em>'.
    * @see org.gastro.business.Waiter
    * @generated
@@ -498,9 +489,8 @@ public interface BusinessPackage extends EPackage
   EClass getWaiter();
 
   /**
-   * Returns the meta object for the container reference '{@link org.gastro.business.Waiter#getBusinessDay
-   * <em>Business Day</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the container reference '{@link org.gastro.business.Waiter#getBusinessDay <em>Business Day</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the container reference '<em>Business Day</em>'.
    * @see org.gastro.business.Waiter#getBusinessDay()
    * @see #getWaiter()
@@ -553,9 +543,9 @@ public interface BusinessPackage extends EPackage
   EAttribute getWaiter_Until();
 
   /**
-   * Returns the meta object for enum '{@link org.gastro.business.OrderState <em>Order State</em>}'. <!-- begin-user-doc
+   * Returns the meta object for enum '{@link org.gastro.business.OrderState <em>Order State</em>}'.
+   * <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
    * @return the meta object for enum '<em>Order State</em>'.
    * @see org.gastro.business.OrderState
    * @generated
@@ -563,8 +553,8 @@ public interface BusinessPackage extends EPackage
   EEnum getOrderState();
 
   /**
-   * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the factory that creates the instances of the model.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the factory that creates the instances of the model.
    * @generated
    */
@@ -579,7 +569,6 @@ public interface BusinessPackage extends EPackage
    * <li>and each data type</li>
    * </ul>
    * <!-- end-user-doc -->
-   * 
    * @generated
    */
   interface Literals
@@ -595,41 +584,41 @@ public interface BusinessPackage extends EPackage
     EClass BUSINESS_DAY = eINSTANCE.getBusinessDay();
 
     /**
-     * The meta object literal for the '<em><b>Date</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Date</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute BUSINESS_DAY__DATE = eINSTANCE.getBusinessDay_Date();
 
     /**
-     * The meta object literal for the '<em><b>Menu Card</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Menu Card</b></em>' reference feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EReference BUSINESS_DAY__MENU_CARD = eINSTANCE.getBusinessDay_MenuCard();
 
     /**
-     * The meta object literal for the '<em><b>Orders</b></em>' containment reference list feature. <!-- begin-user-doc
+     * The meta object literal for the '<em><b>Orders</b></em>' containment reference list feature.
+     * <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
      * @generated
      */
     EReference BUSINESS_DAY__ORDERS = eINSTANCE.getBusinessDay_Orders();
 
     /**
-     * The meta object literal for the '<em><b>Waiters</b></em>' containment reference list feature. <!-- begin-user-doc
+     * The meta object literal for the '<em><b>Waiters</b></em>' containment reference list feature.
+     * <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
      * @generated
      */
     EReference BUSINESS_DAY__WAITERS = eINSTANCE.getBusinessDay_Waiters();
 
     /**
-     * The meta object literal for the '<em><b>Closed</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Closed</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute BUSINESS_DAY__CLOSED = eINSTANCE.getBusinessDay_Closed();
@@ -645,17 +634,17 @@ public interface BusinessPackage extends EPackage
     EClass ORDER = eINSTANCE.getOrder();
 
     /**
-     * The meta object literal for the '<em><b>Business Day</b></em>' container reference feature. <!-- begin-user-doc
+     * The meta object literal for the '<em><b>Business Day</b></em>' container reference feature.
+     * <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
      * @generated
      */
     EReference ORDER__BUSINESS_DAY = eINSTANCE.getOrder_BusinessDay();
 
     /**
-     * The meta object literal for the '<em><b>Table</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Table</b></em>' reference feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EReference ORDER__TABLE = eINSTANCE.getOrder_Table();
@@ -669,9 +658,9 @@ public interface BusinessPackage extends EPackage
     EReference ORDER__ORDER_DETAILS = eINSTANCE.getOrder_OrderDetails();
 
     /**
-     * The meta object literal for the '<em><b>Number</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Number</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute ORDER__NUMBER = eINSTANCE.getOrder_Number();
@@ -679,7 +668,6 @@ public interface BusinessPackage extends EPackage
     /**
      * The meta object literal for the '{@link org.gastro.business.impl.OrderDetailImpl <em>Order Detail</em>}' class.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
      * @see org.gastro.business.impl.OrderDetailImpl
      * @see org.gastro.business.impl.BusinessPackageImpl#getOrderDetail()
      * @generated
@@ -687,41 +675,41 @@ public interface BusinessPackage extends EPackage
     EClass ORDER_DETAIL = eINSTANCE.getOrderDetail();
 
     /**
-     * The meta object literal for the '<em><b>Order</b></em>' container reference feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Order</b></em>' container reference feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EReference ORDER_DETAIL__ORDER = eINSTANCE.getOrderDetail_Order();
 
     /**
-     * The meta object literal for the '<em><b>Offering</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Offering</b></em>' reference feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EReference ORDER_DETAIL__OFFERING = eINSTANCE.getOrderDetail_Offering();
 
     /**
-     * The meta object literal for the '<em><b>Quantity</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Quantity</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute ORDER_DETAIL__QUANTITY = eINSTANCE.getOrderDetail_Quantity();
 
     /**
-     * The meta object literal for the '<em><b>State</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>State</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute ORDER_DETAIL__STATE = eINSTANCE.getOrderDetail_State();
 
     /**
-     * The meta object literal for the '<em><b>Price</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Price</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute ORDER_DETAIL__PRICE = eINSTANCE.getOrderDetail_Price();
@@ -737,41 +725,41 @@ public interface BusinessPackage extends EPackage
     EClass WAITER = eINSTANCE.getWaiter();
 
     /**
-     * The meta object literal for the '<em><b>Business Day</b></em>' container reference feature. <!-- begin-user-doc
+     * The meta object literal for the '<em><b>Business Day</b></em>' container reference feature.
+     * <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     * 
      * @generated
      */
     EReference WAITER__BUSINESS_DAY = eINSTANCE.getWaiter_BusinessDay();
 
     /**
-     * The meta object literal for the '<em><b>Tables</b></em>' reference list feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Tables</b></em>' reference list feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EReference WAITER__TABLES = eINSTANCE.getWaiter_Tables();
 
     /**
-     * The meta object literal for the '<em><b>Employee</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Employee</b></em>' reference feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EReference WAITER__EMPLOYEE = eINSTANCE.getWaiter_Employee();
 
     /**
-     * The meta object literal for the '<em><b>From</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>From</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute WAITER__FROM = eINSTANCE.getWaiter_From();
 
     /**
-     * The meta object literal for the '<em><b>Until</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Until</b></em>' attribute feature.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     * 
      * @generated
      */
     EAttribute WAITER__UNTIL = eINSTANCE.getWaiter_Until();
diff --git a/plugins/org.gastro.business/src/org/gastro/business/Order.java b/plugins/org.gastro.business/src/org/gastro/business/Order.java
index d24340ffad..d69519a766 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/Order.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/Order.java
@@ -21,16 +21,17 @@ import org.gastro.inventory.Table;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Order</b></em>'. <!-- end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.gastro.business.Order#getBusinessDay <em>Business Day</em>}</li>
- * <li>{@link org.gastro.business.Order#getTable <em>Table</em>}</li>
- * <li>{@link org.gastro.business.Order#getOrderDetails <em>Order Details</em>}</li>
- * <li>{@link org.gastro.business.Order#getNumber <em>Number</em>}</li>
+ *   <li>{@link org.gastro.business.Order#getBusinessDay <em>Business Day</em>}</li>
+ *   <li>{@link org.gastro.business.Order#getTable <em>Table</em>}</li>
+ *   <li>{@link org.gastro.business.Order#getOrderDetails <em>Order Details</em>}</li>
+ *   <li>{@link org.gastro.business.Order#getNumber <em>Number</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.business.BusinessPackage#getOrder()
  * @model
  * @extends CDOObject
@@ -39,14 +40,14 @@ import org.gastro.inventory.Table;
 public interface Order extends CDOObject
 {
   /**
-   * Returns the value of the '<em><b>Business Day</b></em>' container reference. It is bidirectional and its opposite
-   * is '{@link org.gastro.business.BusinessDay#getOrders <em>Orders</em>}'. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Business Day</b></em>' container reference.
+   * It is bidirectional and its opposite is '{@link org.gastro.business.BusinessDay#getOrders <em>Orders</em>}'.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Business Day</em>' container reference isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Business Day</em>' container reference.
    * @see #setBusinessDay(BusinessDay)
    * @see org.gastro.business.BusinessPackage#getOrder_BusinessDay()
@@ -59,21 +60,19 @@ public interface Order extends CDOObject
   /**
    * Sets the value of the '{@link org.gastro.business.Order#getBusinessDay <em>Business Day</em>}' container reference.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Business Day</em>' container reference.
+   * @param value the new value of the '<em>Business Day</em>' container reference.
    * @see #getBusinessDay()
    * @generated
    */
   void setBusinessDay(BusinessDay value);
 
   /**
-   * Returns the value of the '<em><b>Table</b></em>' reference. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Table</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Table</em>' reference isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Table</em>' reference.
    * @see #setTable(Table)
    * @see org.gastro.business.BusinessPackage#getOrder_Table()
@@ -83,26 +82,25 @@ public interface Order extends CDOObject
   Table getTable();
 
   /**
-   * Sets the value of the '{@link org.gastro.business.Order#getTable <em>Table</em>}' reference. <!-- begin-user-doc
+   * Sets the value of the '{@link org.gastro.business.Order#getTable <em>Table</em>}' reference.
+   * <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Table</em>' reference.
+   * @param value the new value of the '<em>Table</em>' reference.
    * @see #getTable()
    * @generated
    */
   void setTable(Table value);
 
   /**
-   * Returns the value of the '<em><b>Order Details</b></em>' containment reference list. The list contents are of type
-   * {@link org.gastro.business.OrderDetail}. It is bidirectional and its opposite is '
-   * {@link org.gastro.business.OrderDetail#getOrder <em>Order</em>}'. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Order Details</b></em>' containment reference list.
+   * The list contents are of type {@link org.gastro.business.OrderDetail}.
+   * It is bidirectional and its opposite is '{@link org.gastro.business.OrderDetail#getOrder <em>Order</em>}'.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Order Details</em>' containment reference list isn't clear, there really should be more
    * of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Order Details</em>' containment reference list.
    * @see org.gastro.business.BusinessPackage#getOrder_OrderDetails()
    * @see org.gastro.business.OrderDetail#getOrder
@@ -112,12 +110,12 @@ public interface Order extends CDOObject
   EList<OrderDetail> getOrderDetails();
 
   /**
-   * Returns the value of the '<em><b>Number</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Number</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Number</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Number</em>' attribute.
    * @see #setNumber(int)
    * @see org.gastro.business.BusinessPackage#getOrder_Number()
@@ -127,11 +125,10 @@ public interface Order extends CDOObject
   int getNumber();
 
   /**
-   * Sets the value of the '{@link org.gastro.business.Order#getNumber <em>Number</em>}' attribute. <!-- begin-user-doc
+   * Sets the value of the '{@link org.gastro.business.Order#getNumber <em>Number</em>}' attribute.
+   * <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Number</em>' attribute.
+   * @param value the new value of the '<em>Number</em>' attribute.
    * @see #getNumber()
    * @generated
    */
diff --git a/plugins/org.gastro.business/src/org/gastro/business/OrderDetail.java b/plugins/org.gastro.business/src/org/gastro/business/OrderDetail.java
index 072d8e24e6..cd1dbc6f7f 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/OrderDetail.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/OrderDetail.java
@@ -19,17 +19,18 @@ import org.gastro.inventory.Offering;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Order Detail</b></em>'. <!-- end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.gastro.business.OrderDetail#getOrder <em>Order</em>}</li>
- * <li>{@link org.gastro.business.OrderDetail#getOffering <em>Offering</em>}</li>
- * <li>{@link org.gastro.business.OrderDetail#getQuantity <em>Quantity</em>}</li>
- * <li>{@link org.gastro.business.OrderDetail#getState <em>State</em>}</li>
- * <li>{@link org.gastro.business.OrderDetail#getPrice <em>Price</em>}</li>
+ *   <li>{@link org.gastro.business.OrderDetail#getOrder <em>Order</em>}</li>
+ *   <li>{@link org.gastro.business.OrderDetail#getOffering <em>Offering</em>}</li>
+ *   <li>{@link org.gastro.business.OrderDetail#getQuantity <em>Quantity</em>}</li>
+ *   <li>{@link org.gastro.business.OrderDetail#getState <em>State</em>}</li>
+ *   <li>{@link org.gastro.business.OrderDetail#getPrice <em>Price</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.business.BusinessPackage#getOrderDetail()
  * @model
  * @extends CDOObject
@@ -38,14 +39,14 @@ import org.gastro.inventory.Offering;
 public interface OrderDetail extends CDOObject
 {
   /**
-   * Returns the value of the '<em><b>Order</b></em>' container reference. It is bidirectional and its opposite is '
-   * {@link org.gastro.business.Order#getOrderDetails <em>Order Details</em>}'. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Order</b></em>' container reference.
+   * It is bidirectional and its opposite is '{@link org.gastro.business.Order#getOrderDetails <em>Order Details</em>}'.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Order</em>' container reference isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Order</em>' container reference.
    * @see #setOrder(Order)
    * @see org.gastro.business.BusinessPackage#getOrderDetail_Order()
@@ -67,13 +68,13 @@ public interface OrderDetail extends CDOObject
   void setOrder(Order value);
 
   /**
-   * Returns the value of the '<em><b>Offering</b></em>' reference. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Offering</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Offering</em>' reference isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Offering</em>' reference.
    * @see #setOffering(Offering)
    * @see org.gastro.business.BusinessPackage#getOrderDetail_Offering()
@@ -94,13 +95,13 @@ public interface OrderDetail extends CDOObject
   void setOffering(Offering value);
 
   /**
-   * Returns the value of the '<em><b>Quantity</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Quantity</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Quantity</em>' attribute isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Quantity</em>' attribute.
    * @see #setQuantity(int)
    * @see org.gastro.business.BusinessPackage#getOrderDetail_Quantity()
@@ -121,13 +122,13 @@ public interface OrderDetail extends CDOObject
   void setQuantity(int value);
 
   /**
-   * Returns the value of the '<em><b>State</b></em>' attribute. The literals are from the enumeration
-   * {@link org.gastro.business.OrderState}. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>State</b></em>' attribute.
+   * The literals are from the enumeration {@link org.gastro.business.OrderState}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>State</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>State</em>' attribute.
    * @see org.gastro.business.OrderState
    * @see #setState(OrderState)
@@ -150,12 +151,12 @@ public interface OrderDetail extends CDOObject
   void setState(OrderState value);
 
   /**
-   * Returns the value of the '<em><b>Price</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Price</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Price</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Price</em>' attribute.
    * @see org.gastro.business.BusinessPackage#getOrderDetail_Price()
    * @model transient="true" changeable="false" volatile="true" derived="true"
diff --git a/plugins/org.gastro.business/src/org/gastro/business/OrderState.java b/plugins/org.gastro.business/src/org/gastro/business/OrderState.java
index a0dc4eac00..a63331509f 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/OrderState.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/OrderState.java
@@ -22,7 +22,6 @@ import java.util.List;
 /**
  * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>Order State</b></em>', and
  * utility methods for working with them. <!-- end-user-doc -->
- * 
  * @see org.gastro.business.BusinessPackage#getOrderState()
  * @model
  * @generated
@@ -30,8 +29,8 @@ import java.util.List;
 public enum OrderState implements Enumerator
 {
   /**
-   * The '<em><b>Ordered</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The '<em><b>Ordered</b></em>' literal object.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #ORDERED_VALUE
    * @generated
    * @ordered
@@ -39,8 +38,8 @@ public enum OrderState implements Enumerator
   ORDERED(0, "Ordered", "Ordered"),
 
   /**
-   * The '<em><b>Acknowledged</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The '<em><b>Acknowledged</b></em>' literal object.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #ACKNOWLEDGED_VALUE
    * @generated
    * @ordered
@@ -48,8 +47,8 @@ public enum OrderState implements Enumerator
   ACKNOWLEDGED(2, "Acknowledged", "Acknowledged"),
 
   /**
-   * The '<em><b>Prepared</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The '<em><b>Prepared</b></em>' literal object.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #PREPARED_VALUE
    * @generated
    * @ordered
@@ -57,8 +56,8 @@ public enum OrderState implements Enumerator
   PREPARED(1, "Prepared", "Prepared"),
 
   /**
-   * The '<em><b>Served</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The '<em><b>Served</b></em>' literal object.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #SERVED_VALUE
    * @generated
    * @ordered
@@ -66,8 +65,8 @@ public enum OrderState implements Enumerator
   SERVED(3, "Served", "Served"),
 
   /**
-   * The '<em><b>Paid</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The '<em><b>Paid</b></em>' literal object.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see #PAID_VALUE
    * @generated
    * @ordered
@@ -75,13 +74,13 @@ public enum OrderState implements Enumerator
   PAID(4, "Paid", "Paid");
 
   /**
-   * The '<em><b>Ordered</b></em>' literal value. <!-- begin-user-doc -->
+   * The '<em><b>Ordered</b></em>' literal value.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of '<em><b>Ordered</b></em>' literal object isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @see #ORDERED
    * @model name="Ordered"
    * @generated
@@ -90,13 +89,13 @@ public enum OrderState implements Enumerator
   public static final int ORDERED_VALUE = 0;
 
   /**
-   * The '<em><b>Acknowledged</b></em>' literal value. <!-- begin-user-doc -->
+   * The '<em><b>Acknowledged</b></em>' literal value.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of '<em><b>Acknowledged</b></em>' literal object isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @see #ACKNOWLEDGED
    * @model name="Acknowledged"
    * @generated
@@ -105,13 +104,13 @@ public enum OrderState implements Enumerator
   public static final int ACKNOWLEDGED_VALUE = 2;
 
   /**
-   * The '<em><b>Prepared</b></em>' literal value. <!-- begin-user-doc -->
+   * The '<em><b>Prepared</b></em>' literal value.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of '<em><b>Prepared</b></em>' literal object isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @see #PREPARED
    * @model name="Prepared"
    * @generated
@@ -120,13 +119,13 @@ public enum OrderState implements Enumerator
   public static final int PREPARED_VALUE = 1;
 
   /**
-   * The '<em><b>Served</b></em>' literal value. <!-- begin-user-doc -->
+   * The '<em><b>Served</b></em>' literal value.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of '<em><b>Served</b></em>' literal object isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @see #SERVED
    * @model name="Served"
    * @generated
@@ -135,13 +134,13 @@ public enum OrderState implements Enumerator
   public static final int SERVED_VALUE = 3;
 
   /**
-   * The '<em><b>Paid</b></em>' literal value. <!-- begin-user-doc -->
+   * The '<em><b>Paid</b></em>' literal value.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of '<em><b>Paid</b></em>' literal object isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @see #PAID
    * @model name="Paid"
    * @generated
@@ -150,24 +149,24 @@ public enum OrderState implements Enumerator
   public static final int PAID_VALUE = 4;
 
   /**
-   * An array of all the '<em><b>Order State</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * An array of all the '<em><b>Order State</b></em>' enumerators.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   private static final OrderState[] VALUES_ARRAY = new OrderState[] { ORDERED, ACKNOWLEDGED, PREPARED, SERVED, PAID, };
 
   /**
-   * A public read-only list of all the '<em><b>Order State</b></em>' enumerators. <!-- begin-user-doc --> <!--
+   * A public read-only list of all the '<em><b>Order State</b></em>' enumerators.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    */
   public static final List<OrderState> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
   /**
-   * Returns the '<em><b>Order State</b></em>' literal with the specified literal value. <!-- begin-user-doc --> <!--
+   * Returns the '<em><b>Order State</b></em>' literal with the specified literal value.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    */
   public static OrderState get(String literal)
@@ -184,9 +183,9 @@ public enum OrderState implements Enumerator
   }
 
   /**
-   * Returns the '<em><b>Order State</b></em>' literal with the specified name. <!-- begin-user-doc --> <!--
+   * Returns the '<em><b>Order State</b></em>' literal with the specified name.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    */
   public static OrderState getByName(String name)
@@ -203,9 +202,9 @@ public enum OrderState implements Enumerator
   }
 
   /**
-   * Returns the '<em><b>Order State</b></em>' literal with the specified integer value. <!-- begin-user-doc --> <!--
+   * Returns the '<em><b>Order State</b></em>' literal with the specified integer value.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    */
   public static OrderState get(int value)
@@ -228,28 +227,25 @@ public enum OrderState implements Enumerator
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private final int value;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private final String name;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private final String literal;
 
   /**
-   * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Only this class can construct instances.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   private OrderState(int value, String name, String literal)
@@ -261,7 +257,6 @@ public enum OrderState implements Enumerator
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public int getValue()
@@ -271,7 +266,6 @@ public enum OrderState implements Enumerator
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getName()
@@ -281,7 +275,6 @@ public enum OrderState implements Enumerator
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getLiteral()
@@ -290,9 +283,9 @@ public enum OrderState implements Enumerator
   }
 
   /**
-   * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc --> <!--
+   * Returns the literal value of the enumerator, which is its string representation.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.gastro.business/src/org/gastro/business/Waiter.java b/plugins/org.gastro.business/src/org/gastro/business/Waiter.java
index d6054ed486..aceac9c112 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/Waiter.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/Waiter.java
@@ -24,17 +24,18 @@ import java.util.Date;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Waiter</b></em>'. <!-- end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.gastro.business.Waiter#getBusinessDay <em>Business Day</em>}</li>
- * <li>{@link org.gastro.business.Waiter#getTables <em>Tables</em>}</li>
- * <li>{@link org.gastro.business.Waiter#getEmployee <em>Employee</em>}</li>
- * <li>{@link org.gastro.business.Waiter#getFrom <em>From</em>}</li>
- * <li>{@link org.gastro.business.Waiter#getUntil <em>Until</em>}</li>
+ *   <li>{@link org.gastro.business.Waiter#getBusinessDay <em>Business Day</em>}</li>
+ *   <li>{@link org.gastro.business.Waiter#getTables <em>Tables</em>}</li>
+ *   <li>{@link org.gastro.business.Waiter#getEmployee <em>Employee</em>}</li>
+ *   <li>{@link org.gastro.business.Waiter#getFrom <em>From</em>}</li>
+ *   <li>{@link org.gastro.business.Waiter#getUntil <em>Until</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.gastro.business.BusinessPackage#getWaiter()
  * @model
  * @extends CDOObject
@@ -43,14 +44,14 @@ import java.util.Date;
 public interface Waiter extends CDOObject
 {
   /**
-   * Returns the value of the '<em><b>Business Day</b></em>' container reference. It is bidirectional and its opposite
-   * is '{@link org.gastro.business.BusinessDay#getWaiters <em>Waiters</em>}'. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Business Day</b></em>' container reference.
+   * It is bidirectional and its opposite is '{@link org.gastro.business.BusinessDay#getWaiters <em>Waiters</em>}'.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Business Day</em>' container reference isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Business Day</em>' container reference.
    * @see #setBusinessDay(BusinessDay)
    * @see org.gastro.business.BusinessPackage#getWaiter_BusinessDay()
@@ -61,25 +62,23 @@ public interface Waiter extends CDOObject
   BusinessDay getBusinessDay();
 
   /**
-   * Sets the value of the '{@link org.gastro.business.Waiter#getBusinessDay <em>Business Day</em>}' container
-   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Business Day</em>' container reference.
+   * Sets the value of the '{@link org.gastro.business.Waiter#getBusinessDay <em>Business Day</em>}' container reference.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param value the new value of the '<em>Business Day</em>' container reference.
    * @see #getBusinessDay()
    * @generated
    */
   void setBusinessDay(BusinessDay value);
 
   /**
-   * Returns the value of the '<em><b>Tables</b></em>' reference list. The list contents are of type
-   * {@link org.gastro.inventory.Table}. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Tables</b></em>' reference list.
+   * The list contents are of type {@link org.gastro.inventory.Table}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Tables</em>' reference list isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Tables</em>' reference list.
    * @see org.gastro.business.BusinessPackage#getWaiter_Tables()
    * @model
@@ -88,13 +87,13 @@ public interface Waiter extends CDOObject
   EList<Table> getTables();
 
   /**
-   * Returns the value of the '<em><b>Employee</b></em>' reference. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Employee</b></em>' reference.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Employee</em>' reference isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Employee</em>' reference.
    * @see #setEmployee(Employee)
    * @see org.gastro.business.BusinessPackage#getWaiter_Employee()
@@ -115,12 +114,12 @@ public interface Waiter extends CDOObject
   void setEmployee(Employee value);
 
   /**
-   * Returns the value of the '<em><b>From</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>From</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>From</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>From</em>' attribute.
    * @see #setFrom(Date)
    * @see org.gastro.business.BusinessPackage#getWaiter_From()
@@ -130,23 +129,22 @@ public interface Waiter extends CDOObject
   Date getFrom();
 
   /**
-   * Sets the value of the '{@link org.gastro.business.Waiter#getFrom <em>From</em>}' attribute. <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.gastro.business.Waiter#getFrom <em>From</em>}' attribute.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>From</em>' attribute.
+   * @param value the new value of the '<em>From</em>' attribute.
    * @see #getFrom()
    * @generated
    */
   void setFrom(Date value);
 
   /**
-   * Returns the value of the '<em><b>Until</b></em>' attribute. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Until</b></em>' attribute.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Until</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Until</em>' attribute.
    * @see #setUntil(Date)
    * @see org.gastro.business.BusinessPackage#getWaiter_Until()
@@ -156,11 +154,10 @@ public interface Waiter extends CDOObject
   Date getUntil();
 
   /**
-   * Sets the value of the '{@link org.gastro.business.Waiter#getUntil <em>Until</em>}' attribute. <!-- begin-user-doc
+   * Sets the value of the '{@link org.gastro.business.Waiter#getUntil <em>Until</em>}' attribute.
+   * <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
-   * @param value
-   *          the new value of the '<em>Until</em>' attribute.
+   * @param value the new value of the '<em>Until</em>' attribute.
    * @see #getUntil()
    * @generated
    */
diff --git a/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessDayImpl.java b/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessDayImpl.java
index 9a4ba76263..19a28a2b6e 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessDayImpl.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessDayImpl.java
@@ -31,21 +31,20 @@ import java.util.Date;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.gastro.business.impl.BusinessDayImpl#getDate <em>Date</em>}</li>
- * <li>{@link org.gastro.business.impl.BusinessDayImpl#getMenuCard <em>Menu Card</em>}</li>
- * <li>{@link org.gastro.business.impl.BusinessDayImpl#getOrders <em>Orders</em>}</li>
- * <li>{@link org.gastro.business.impl.BusinessDayImpl#getWaiters <em>Waiters</em>}</li>
- * <li>{@link org.gastro.business.impl.BusinessDayImpl#isClosed <em>Closed</em>}</li>
+ *   <li>{@link org.gastro.business.impl.BusinessDayImpl#getDate <em>Date</em>}</li>
+ *   <li>{@link org.gastro.business.impl.BusinessDayImpl#getMenuCard <em>Menu Card</em>}</li>
+ *   <li>{@link org.gastro.business.impl.BusinessDayImpl#getOrders <em>Orders</em>}</li>
+ *   <li>{@link org.gastro.business.impl.BusinessDayImpl#getWaiters <em>Waiters</em>}</li>
+ *   <li>{@link org.gastro.business.impl.BusinessDayImpl#isClosed <em>Closed</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class BusinessDayImpl extends CDOObjectImpl implements BusinessDay
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected BusinessDayImpl()
@@ -55,7 +54,6 @@ public class BusinessDayImpl extends CDOObjectImpl implements BusinessDay
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -66,7 +64,6 @@ public class BusinessDayImpl extends CDOObjectImpl implements BusinessDay
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -77,7 +74,6 @@ public class BusinessDayImpl extends CDOObjectImpl implements BusinessDay
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Date getDate()
@@ -87,7 +83,6 @@ public class BusinessDayImpl extends CDOObjectImpl implements BusinessDay
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setDate(Date newDate)
@@ -97,7 +92,6 @@ public class BusinessDayImpl extends CDOObjectImpl implements BusinessDay
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public MenuCard getMenuCard()
@@ -107,7 +101,6 @@ public class BusinessDayImpl extends CDOObjectImpl implements BusinessDay
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setMenuCard(MenuCard newMenuCard)
@@ -117,7 +110,6 @@ public class BusinessDayImpl extends CDOObjectImpl implements BusinessDay
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -128,7 +120,6 @@ public class BusinessDayImpl extends CDOObjectImpl implements BusinessDay
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -139,7 +130,6 @@ public class BusinessDayImpl extends CDOObjectImpl implements BusinessDay
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public boolean isClosed()
@@ -149,7 +139,6 @@ public class BusinessDayImpl extends CDOObjectImpl implements BusinessDay
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setClosed(boolean newClosed)
diff --git a/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java b/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java
index 77c7a9b278..8bc336968e 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessFactoryImpl.java
@@ -30,14 +30,13 @@ import org.gastro.business.Waiter;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- * 
  * @generated
  */
 public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory
 {
   /**
-   * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates the default factory implementation.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public static BusinessFactory init()
@@ -59,8 +58,8 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory
   }
 
   /**
-   * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates an instance of the factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public BusinessFactoryImpl()
@@ -70,7 +69,6 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -79,13 +77,13 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory
     switch (eClass.getClassifierID())
     {
     case BusinessPackage.BUSINESS_DAY:
-      return createBusinessDay();
+      return (EObject)createBusinessDay();
     case BusinessPackage.ORDER:
-      return createOrder();
+      return (EObject)createOrder();
     case BusinessPackage.ORDER_DETAIL:
-      return createOrderDetail();
+      return (EObject)createOrderDetail();
     case BusinessPackage.WAITER:
-      return createWaiter();
+      return (EObject)createWaiter();
     default:
       throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
@@ -93,7 +91,6 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -110,7 +107,6 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -127,7 +123,6 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public BusinessDay createBusinessDay()
@@ -138,7 +133,6 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Order createOrder()
@@ -149,7 +143,6 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public OrderDetail createOrderDetail()
@@ -160,7 +153,6 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Waiter createWaiter()
@@ -171,23 +163,19 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public OrderState createOrderStateFromString(EDataType eDataType, String initialValue)
   {
     OrderState result = OrderState.get(initialValue);
     if (result == null)
-    {
       throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
           + eDataType.getName() + "'");
-    }
     return result;
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String convertOrderStateToString(EDataType eDataType, Object instanceValue)
@@ -197,7 +185,6 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public BusinessPackage getBusinessPackage()
@@ -207,7 +194,6 @@ public class BusinessFactoryImpl extends EFactoryImpl implements BusinessFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java b/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java
index ae91396558..df731c7172 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/impl/BusinessPackageImpl.java
@@ -31,42 +31,36 @@ import org.gastro.inventory.InventoryPackage;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- * 
  * @generated
  */
 public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass businessDayEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass orderEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass orderDetailEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass waiterEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EEnum orderStateEEnum = null;
@@ -91,18 +85,17 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private static boolean isInited = false;
 
   /**
    * 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 BusinessPackage#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 -->
-   * <!-- end-user-doc -->
    * 
+   * <p>This method is used to initialize {@link BusinessPackage#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 -->
+   * <!-- end-user-doc -->
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -111,9 +104,7 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
   public static BusinessPackage init()
   {
     if (isInited)
-    {
       return (BusinessPackage)EPackage.Registry.INSTANCE.getEPackage(BusinessPackage.eNS_URI);
-    }
 
     // Obtain or create and register package
     BusinessPackageImpl theBusinessPackage = (BusinessPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BusinessPackageImpl ? EPackage.Registry.INSTANCE
@@ -140,7 +131,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getBusinessDay()
@@ -150,7 +140,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getBusinessDay_Date()
@@ -160,7 +149,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getBusinessDay_MenuCard()
@@ -170,7 +158,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getBusinessDay_Orders()
@@ -180,7 +167,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getBusinessDay_Waiters()
@@ -190,7 +176,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getBusinessDay_Closed()
@@ -200,7 +185,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getOrder()
@@ -210,7 +194,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getOrder_BusinessDay()
@@ -220,7 +203,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getOrder_Table()
@@ -230,7 +212,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getOrder_OrderDetails()
@@ -240,7 +221,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getOrder_Number()
@@ -250,7 +230,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getOrderDetail()
@@ -260,7 +239,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getOrderDetail_Order()
@@ -270,7 +248,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getOrderDetail_Offering()
@@ -280,7 +257,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getOrderDetail_Quantity()
@@ -290,7 +266,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getOrderDetail_State()
@@ -300,7 +275,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getOrderDetail_Price()
@@ -310,7 +284,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getWaiter()
@@ -320,7 +293,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getWaiter_BusinessDay()
@@ -330,7 +302,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getWaiter_Tables()
@@ -340,7 +311,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getWaiter_Employee()
@@ -350,7 +320,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getWaiter_From()
@@ -360,7 +329,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getWaiter_Until()
@@ -370,7 +338,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EEnum getOrderState()
@@ -380,7 +347,6 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public BusinessFactory getBusinessFactory()
@@ -390,23 +356,20 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private boolean isCreated = false;
 
   /**
-   * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
-   * first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates the meta-model objects for the package.  This method is
+   * guarded to have no affect on any invocation but its first.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public void createPackageContents()
   {
     if (isCreated)
-    {
       return;
-    }
     isCreated = true;
 
     // Create classes and their features
@@ -443,23 +406,20 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private boolean isInitialized = false;
 
   /**
-   * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
-   * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Complete the initialization of the package and its meta-model.  This
+   * method is guarded to have no affect on any invocation but its first.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public void initializePackageContents()
   {
     if (isInitialized)
-    {
       return;
-    }
     isInitialized = true;
 
     // Initialize package
@@ -485,47 +445,47 @@ public class BusinessPackageImpl extends EPackageImpl implements BusinessPackage
     initEReference(getBusinessDay_MenuCard(), theInventoryPackage.getMenuCard(), null, "menuCard", null, 1, 1,
         BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBusinessDay_Orders(), getOrder(), getOrder_BusinessDay(), "orders", null, 0, -1,
+    initEReference(getBusinessDay_Orders(), this.getOrder(), this.getOrder_BusinessDay(), "orders", null, 0, -1,
         BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBusinessDay_Waiters(), getWaiter(), getWaiter_BusinessDay(), "waiters", null, 1, -1,
+    initEReference(getBusinessDay_Waiters(), this.getWaiter(), this.getWaiter_BusinessDay(), "waiters", null, 1, -1,
         BusinessDay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getBusinessDay_Closed(), ecorePackage.getEBoolean(), "closed", null, 0, 1, BusinessDay.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(orderEClass, Order.class, "Order", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrder_BusinessDay(), getBusinessDay(), getBusinessDay_Orders(), "businessDay", null, 1, 1,
-        Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+    initEReference(getOrder_BusinessDay(), this.getBusinessDay(), this.getBusinessDay_Orders(), "businessDay", null, 1,
+        1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getOrder_Table(), theInventoryPackage.getTable(), null, "table", null, 1, 1, Order.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 1, -1,
-        Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrder_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Order(), "orderDetails", null,
+        1, -1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getOrder_Number(), ecorePackage.getEInt(), "number", null, 0, 1, Order.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getOrderDetail_Order(), this.getOrder(), this.getOrder_OrderDetails(), "order", null, 1, 1,
+        OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getOrderDetail_Offering(), theInventoryPackage.getOffering(), null, "offering", null, 1, 1,
         OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getOrderDetail_Quantity(), ecorePackage.getEInt(), "quantity", null, 0, 1, OrderDetail.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getOrderDetail_State(), getOrderState(), "state", null, 0, 1, OrderDetail.class, !IS_TRANSIENT,
+    initEAttribute(getOrderDetail_State(), this.getOrderState(), "state", null, 0, 1, OrderDetail.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class,
         IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 
     initEClass(waiterEClass, Waiter.class, "Waiter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getWaiter_BusinessDay(), getBusinessDay(), getBusinessDay_Waiters(), "businessDay", null, 0, 1,
-        Waiter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getWaiter_BusinessDay(), this.getBusinessDay(), this.getBusinessDay_Waiters(), "businessDay", null,
+        0, 1, Waiter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getWaiter_Tables(), theInventoryPackage.getTable(), null, "tables", null, 0, -1, Waiter.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.gastro.business/src/org/gastro/business/impl/OrderDetailImpl.java b/plugins/org.gastro.business/src/org/gastro/business/impl/OrderDetailImpl.java
index 4103585205..7092fdd083 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/impl/OrderDetailImpl.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/impl/OrderDetailImpl.java
@@ -28,21 +28,20 @@ import org.gastro.inventory.Offering;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.gastro.business.impl.OrderDetailImpl#getOrder <em>Order</em>}</li>
- * <li>{@link org.gastro.business.impl.OrderDetailImpl#getOffering <em>Offering</em>}</li>
- * <li>{@link org.gastro.business.impl.OrderDetailImpl#getQuantity <em>Quantity</em>}</li>
- * <li>{@link org.gastro.business.impl.OrderDetailImpl#getState <em>State</em>}</li>
- * <li>{@link org.gastro.business.impl.OrderDetailImpl#getPrice <em>Price</em>}</li>
+ *   <li>{@link org.gastro.business.impl.OrderDetailImpl#getOrder <em>Order</em>}</li>
+ *   <li>{@link org.gastro.business.impl.OrderDetailImpl#getOffering <em>Offering</em>}</li>
+ *   <li>{@link org.gastro.business.impl.OrderDetailImpl#getQuantity <em>Quantity</em>}</li>
+ *   <li>{@link org.gastro.business.impl.OrderDetailImpl#getState <em>State</em>}</li>
+ *   <li>{@link org.gastro.business.impl.OrderDetailImpl#getPrice <em>Price</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected OrderDetailImpl()
@@ -52,7 +51,6 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -63,7 +61,6 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -74,7 +71,6 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Order getOrder()
@@ -84,7 +80,6 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setOrder(Order newOrder)
@@ -94,7 +89,6 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Offering getOffering()
@@ -104,7 +98,6 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setOffering(Offering newOffering)
@@ -114,7 +107,6 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public int getQuantity()
@@ -124,7 +116,6 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setQuantity(int newQuantity)
@@ -134,7 +125,6 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public OrderState getState()
@@ -144,7 +134,6 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setState(OrderState newState)
diff --git a/plugins/org.gastro.business/src/org/gastro/business/impl/OrderImpl.java b/plugins/org.gastro.business/src/org/gastro/business/impl/OrderImpl.java
index ca75463ef4..94d860c473 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/impl/OrderImpl.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/impl/OrderImpl.java
@@ -29,20 +29,19 @@ import org.gastro.inventory.Table;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.gastro.business.impl.OrderImpl#getBusinessDay <em>Business Day</em>}</li>
- * <li>{@link org.gastro.business.impl.OrderImpl#getTable <em>Table</em>}</li>
- * <li>{@link org.gastro.business.impl.OrderImpl#getOrderDetails <em>Order Details</em>}</li>
- * <li>{@link org.gastro.business.impl.OrderImpl#getNumber <em>Number</em>}</li>
+ *   <li>{@link org.gastro.business.impl.OrderImpl#getBusinessDay <em>Business Day</em>}</li>
+ *   <li>{@link org.gastro.business.impl.OrderImpl#getTable <em>Table</em>}</li>
+ *   <li>{@link org.gastro.business.impl.OrderImpl#getOrderDetails <em>Order Details</em>}</li>
+ *   <li>{@link org.gastro.business.impl.OrderImpl#getNumber <em>Number</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class OrderImpl extends CDOObjectImpl implements Order
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected OrderImpl()
@@ -52,7 +51,6 @@ public class OrderImpl extends CDOObjectImpl implements Order
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -63,7 +61,6 @@ public class OrderImpl extends CDOObjectImpl implements Order
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -74,7 +71,6 @@ public class OrderImpl extends CDOObjectImpl implements Order
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public BusinessDay getBusinessDay()
@@ -84,7 +80,6 @@ public class OrderImpl extends CDOObjectImpl implements Order
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setBusinessDay(BusinessDay newBusinessDay)
@@ -94,7 +89,6 @@ public class OrderImpl extends CDOObjectImpl implements Order
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Table getTable()
@@ -104,7 +98,6 @@ public class OrderImpl extends CDOObjectImpl implements Order
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setTable(Table newTable)
@@ -114,7 +107,6 @@ public class OrderImpl extends CDOObjectImpl implements Order
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -125,7 +117,6 @@ public class OrderImpl extends CDOObjectImpl implements Order
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public int getNumber()
@@ -135,7 +126,6 @@ public class OrderImpl extends CDOObjectImpl implements Order
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setNumber(int newNumber)
diff --git a/plugins/org.gastro.business/src/org/gastro/business/impl/WaiterImpl.java b/plugins/org.gastro.business/src/org/gastro/business/impl/WaiterImpl.java
index 71eb4f35c9..261c38f81b 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/impl/WaiterImpl.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/impl/WaiterImpl.java
@@ -31,21 +31,20 @@ import java.util.Date;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.gastro.business.impl.WaiterImpl#getBusinessDay <em>Business Day</em>}</li>
- * <li>{@link org.gastro.business.impl.WaiterImpl#getTables <em>Tables</em>}</li>
- * <li>{@link org.gastro.business.impl.WaiterImpl#getEmployee <em>Employee</em>}</li>
- * <li>{@link org.gastro.business.impl.WaiterImpl#getFrom <em>From</em>}</li>
- * <li>{@link org.gastro.business.impl.WaiterImpl#getUntil <em>Until</em>}</li>
+ *   <li>{@link org.gastro.business.impl.WaiterImpl#getBusinessDay <em>Business Day</em>}</li>
+ *   <li>{@link org.gastro.business.impl.WaiterImpl#getTables <em>Tables</em>}</li>
+ *   <li>{@link org.gastro.business.impl.WaiterImpl#getEmployee <em>Employee</em>}</li>
+ *   <li>{@link org.gastro.business.impl.WaiterImpl#getFrom <em>From</em>}</li>
+ *   <li>{@link org.gastro.business.impl.WaiterImpl#getUntil <em>Until</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class WaiterImpl extends CDOObjectImpl implements Waiter
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected WaiterImpl()
@@ -55,7 +54,6 @@ public class WaiterImpl extends CDOObjectImpl implements Waiter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -66,7 +64,6 @@ public class WaiterImpl extends CDOObjectImpl implements Waiter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -77,7 +74,6 @@ public class WaiterImpl extends CDOObjectImpl implements Waiter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public BusinessDay getBusinessDay()
@@ -87,7 +83,6 @@ public class WaiterImpl extends CDOObjectImpl implements Waiter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setBusinessDay(BusinessDay newBusinessDay)
@@ -97,7 +92,6 @@ public class WaiterImpl extends CDOObjectImpl implements Waiter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -108,7 +102,6 @@ public class WaiterImpl extends CDOObjectImpl implements Waiter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Employee getEmployee()
@@ -118,7 +111,6 @@ public class WaiterImpl extends CDOObjectImpl implements Waiter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setEmployee(Employee newEmployee)
@@ -128,7 +120,6 @@ public class WaiterImpl extends CDOObjectImpl implements Waiter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Date getFrom()
@@ -138,7 +129,6 @@ public class WaiterImpl extends CDOObjectImpl implements Waiter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setFrom(Date newFrom)
@@ -148,7 +138,6 @@ public class WaiterImpl extends CDOObjectImpl implements Waiter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Date getUntil()
@@ -158,7 +147,6 @@ public class WaiterImpl extends CDOObjectImpl implements Waiter
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setUntil(Date newUntil)
diff --git a/plugins/org.gastro.business/src/org/gastro/business/util/BusinessAdapterFactory.java b/plugins/org.gastro.business/src/org/gastro/business/util/BusinessAdapterFactory.java
index 973695ca73..6ada3f1b7c 100644
--- a/plugins/org.gastro.business/src/org/gastro/business/util/BusinessAdapterFactory.java
+++ b/plugins/org.gastro.business/src/org/gastro/business/util/BusinessAdapterFactory.java
@@ -27,22 +27,21 @@ import org.gastro.business.Waiter;
 /**
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
  * method for each class of the model. <!-- end-user-doc -->
- * 
  * @see org.gastro.business.BusinessPackage
  * @generated
  */
 public class BusinessAdapterFactory extends AdapterFactoryImpl
 {
   /**
-   * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The cached model package.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected static BusinessPackage modelPackage;
 
   /**
-   * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates an instance of the adapter factory.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public BusinessAdapterFactory()
@@ -54,10 +53,10 @@ public class BusinessAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
+   * Returns whether this factory is applicable for the type of the object.
+   * <!-- begin-user-doc --> This implementation
    * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
    * end-user-doc -->
-   * 
    * @return whether this factory is applicable for the type of the object.
    * @generated
    */
@@ -76,8 +75,8 @@ public class BusinessAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The switch that delegates to the <code>createXXX</code> methods.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   protected BusinessSwitch<Adapter> modelSwitch = new BusinessSwitch<Adapter>()
@@ -114,10 +113,9 @@ public class BusinessAdapterFactory extends AdapterFactoryImpl
   };
 
   /**
-   * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @param target
-   *          the object to adapt.
+   * Creates an adapter for the <code>target</code>.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @param target the object to adapt.
    * @return the adapter for the <code>target</code>.
    * @generated
    */
@@ -184,9 +182,9 @@ public class BusinessAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
+   * Creates a new adapter for the default case.
+   * <!-- begin-user-doc --> This default implementation returns null. <!--
    * end-user-doc -->
-   * 
    * @return the new adapter.
    * @generated
    */
diff --git a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java
index e24b6d285c..635d3cf606 100644
--- a/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java
+++ b/plugins/org.gastro.inventory.edit/src/org/gastro/inventory/provider/InventoryItemProviderAdapterFactory.java
@@ -404,7 +404,7 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
     if (isFactoryForType(type))
     {
       Object adapter = super.adapt(object, type);
-      if (!(type instanceof Class<?>) || ((Class<?>)type).isInstance(adapter))
+      if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter)))
       {
         return adapter;
       }
@@ -457,49 +457,27 @@ public class InventoryItemProviderAdapterFactory extends InventoryAdapterFactory
   public void dispose()
   {
     if (stockItemProvider != null)
-    {
       stockItemProvider.dispose();
-    }
     if (stockProductItemProvider != null)
-    {
       stockProductItemProvider.dispose();
-    }
     if (recipeItemProvider != null)
-    {
       recipeItemProvider.dispose();
-    }
     if (ingredientItemProvider != null)
-    {
       ingredientItemProvider.dispose();
-    }
     if (menuCardItemProvider != null)
-    {
       menuCardItemProvider.dispose();
-    }
     if (restaurantItemProvider != null)
-    {
       restaurantItemProvider.dispose();
-    }
     if (departmentItemProvider != null)
-    {
       departmentItemProvider.dispose();
-    }
     if (offeringItemProvider != null)
-    {
       offeringItemProvider.dispose();
-    }
     if (tableItemProvider != null)
-    {
       tableItemProvider.dispose();
-    }
     if (employeeItemProvider != null)
-    {
       employeeItemProvider.dispose();
-    }
     if (sectionItemProvider != null)
-    {
       sectionItemProvider.dispose();
-    }
   }
 
 }
diff --git a/plugins/org.gastro.inventory/model/inventory.genmodel b/plugins/org.gastro.inventory/model/inventory.genmodel
index b27d0283b7..199d878724 100644
--- a/plugins/org.gastro.inventory/model/inventory.genmodel
+++ b/plugins/org.gastro.inventory/model/inventory.genmodel
@@ -1,81 +1,82 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.gastro.inventory/src"
-    creationIcons="false" editorDirectory="" modelPluginID="org.gastro.inventory"
-    modelName="Inventory" rootExtendsInterface="org.eclipse.emf.cdo.CDOObject" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
-    reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo"
-    featureDelegation="Reflective" complianceLevel="5.0" copyrightFields="false" optimizedHasChildren="true">
-  <foreignModel>inventory.ecore</foreignModel>
-  <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
-  <genPackages prefix="Inventory" basePackage="org.gastro" disposableProviderFactory="true"
-      ecorePackage="inventory.ecore#/">
-    <genClasses ecoreClass="inventory.ecore#//Stock">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference inventory.ecore#//Stock/products"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Stock/name"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference inventory.ecore#//Stock/department"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="inventory.ecore#//Product">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Product/name"/>
-      <genOperations ecoreOperation="inventory.ecore#//Product/getCost"/>
-    </genClasses>
-    <genClasses ecoreClass="inventory.ecore#//StockProduct">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference inventory.ecore#//StockProduct/stock"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//StockProduct/cost"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//StockProduct/available"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//StockProduct/orderLimit"/>
-    </genClasses>
-    <genClasses ecoreClass="inventory.ecore#//Recipe">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference inventory.ecore#//Recipe/ingredients"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference inventory.ecore#//Recipe/department"/>
-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Recipe/cost"/>
-    </genClasses>
-    <genClasses ecoreClass="inventory.ecore#//Ingredient">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference inventory.ecore#//Ingredient/recipe"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference inventory.ecore#//Ingredient/product"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Ingredient/quantity"/>
-    </genClasses>
-    <genClasses ecoreClass="inventory.ecore#//MenuCard">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//MenuCard/title"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference inventory.ecore#//MenuCard/restaurant"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference inventory.ecore#//MenuCard/sections"/>
-    </genClasses>
-    <genClasses ecoreClass="inventory.ecore#//Restaurant">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Restaurant/name"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference inventory.ecore#//Restaurant/departments"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference inventory.ecore#//Restaurant/menuCards"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference inventory.ecore#//Restaurant/tables"/>
-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference inventory.ecore#//Restaurant/stations"/>
-    </genClasses>
-    <genClasses ecoreClass="inventory.ecore#//Department">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference inventory.ecore#//Department/recipes"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference inventory.ecore#//Department/restaurant"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference inventory.ecore#//Department/employees"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference inventory.ecore#//Department/stocks"/>
-    </genClasses>
-    <genClasses ecoreClass="inventory.ecore#//Offering">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference inventory.ecore#//Offering/product"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Offering/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Offering/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Offering/price"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference inventory.ecore#//Offering/section"/>
-    </genClasses>
-    <genClasses ecoreClass="inventory.ecore#//Table">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Table/seats"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference inventory.ecore#//Table/restaurant"/>
-    </genClasses>
-    <genClasses ecoreClass="inventory.ecore#//Employee">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference inventory.ecore#//Employee/department"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Employee/name"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="inventory.ecore#//Station">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Station/stationID"/>
-    </genClasses>
-    <genClasses ecoreClass="inventory.ecore#//Section">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference inventory.ecore#//Section/menuCard"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference inventory.ecore#//Section/offerings"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Section/title"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Section/text"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.gastro.inventory/src"
+    creationIcons="false" editorDirectory="" modelPluginID="org.gastro.inventory"
+    modelName="Inventory" rootExtendsInterface="org.eclipse.emf.cdo.CDOObject" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
+    reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo"
+    featureDelegation="Reflective" complianceLevel="5.0" copyrightFields="false" optimizedHasChildren="true"
+    runtimeVersion="2.6">
+  <foreignModel>inventory.ecore</foreignModel>
+  <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
+  <genPackages prefix="Inventory" basePackage="org.gastro" disposableProviderFactory="true"
+      ecorePackage="inventory.ecore#/">
+    <genClasses ecoreClass="inventory.ecore#//Stock">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference inventory.ecore#//Stock/products"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Stock/name"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference inventory.ecore#//Stock/department"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="inventory.ecore#//Product">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Product/name"/>
+      <genOperations ecoreOperation="inventory.ecore#//Product/getCost"/>
+    </genClasses>
+    <genClasses ecoreClass="inventory.ecore#//StockProduct">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference inventory.ecore#//StockProduct/stock"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//StockProduct/cost"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//StockProduct/available"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//StockProduct/orderLimit"/>
+    </genClasses>
+    <genClasses ecoreClass="inventory.ecore#//Recipe">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference inventory.ecore#//Recipe/ingredients"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference inventory.ecore#//Recipe/department"/>
+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Recipe/cost"/>
+    </genClasses>
+    <genClasses ecoreClass="inventory.ecore#//Ingredient">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference inventory.ecore#//Ingredient/recipe"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference inventory.ecore#//Ingredient/product"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Ingredient/quantity"/>
+    </genClasses>
+    <genClasses ecoreClass="inventory.ecore#//MenuCard">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//MenuCard/title"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference inventory.ecore#//MenuCard/restaurant"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference inventory.ecore#//MenuCard/sections"/>
+    </genClasses>
+    <genClasses ecoreClass="inventory.ecore#//Restaurant">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Restaurant/name"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference inventory.ecore#//Restaurant/departments"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference inventory.ecore#//Restaurant/menuCards"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference inventory.ecore#//Restaurant/tables"/>
+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference inventory.ecore#//Restaurant/stations"/>
+    </genClasses>
+    <genClasses ecoreClass="inventory.ecore#//Department">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference inventory.ecore#//Department/recipes"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference inventory.ecore#//Department/restaurant"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference inventory.ecore#//Department/employees"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference inventory.ecore#//Department/stocks"/>
+    </genClasses>
+    <genClasses ecoreClass="inventory.ecore#//Offering">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference inventory.ecore#//Offering/product"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Offering/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Offering/description"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Offering/price"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference inventory.ecore#//Offering/section"/>
+    </genClasses>
+    <genClasses ecoreClass="inventory.ecore#//Table">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Table/seats"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference inventory.ecore#//Table/restaurant"/>
+    </genClasses>
+    <genClasses ecoreClass="inventory.ecore#//Employee">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference inventory.ecore#//Employee/department"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Employee/name"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="inventory.ecore#//Station">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Station/stationID"/>
+    </genClasses>
+    <genClasses ecoreClass="inventory.ecore#//Section">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference inventory.ecore#//Section/menuCard"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference inventory.ecore#//Section/offerings"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Section/title"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute inventory.ecore#//Section/text"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java
index 9e8458d4e2..63bcca964f 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryFactoryImpl.java
@@ -84,27 +84,27 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
     switch (eClass.getClassifierID())
     {
     case InventoryPackage.STOCK:
-      return createStock();
+      return (EObject)createStock();
     case InventoryPackage.STOCK_PRODUCT:
-      return createStockProduct();
+      return (EObject)createStockProduct();
     case InventoryPackage.RECIPE:
-      return createRecipe();
+      return (EObject)createRecipe();
     case InventoryPackage.INGREDIENT:
-      return createIngredient();
+      return (EObject)createIngredient();
     case InventoryPackage.MENU_CARD:
-      return createMenuCard();
+      return (EObject)createMenuCard();
     case InventoryPackage.RESTAURANT:
-      return createRestaurant();
+      return (EObject)createRestaurant();
     case InventoryPackage.DEPARTMENT:
-      return createDepartment();
+      return (EObject)createDepartment();
     case InventoryPackage.OFFERING:
-      return createOffering();
+      return (EObject)createOffering();
     case InventoryPackage.TABLE:
-      return createTable();
+      return (EObject)createTable();
     case InventoryPackage.EMPLOYEE:
-      return createEmployee();
+      return (EObject)createEmployee();
     case InventoryPackage.SECTION:
-      return createSection();
+      return (EObject)createSection();
     default:
       throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
diff --git a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java
index 8311477730..feac5ce3fe 100644
--- a/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java
+++ b/plugins/org.gastro.inventory/src/org/gastro/inventory/impl/InventoryPackageImpl.java
@@ -173,9 +173,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
   public static InventoryPackage init()
   {
     if (isInited)
-    {
       return (InventoryPackage)EPackage.Registry.INSTANCE.getEPackage(InventoryPackage.eNS_URI);
-    }
 
     // Obtain or create and register package
     InventoryPackageImpl theInventoryPackage = (InventoryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InventoryPackageImpl ? EPackage.Registry.INSTANCE
@@ -753,9 +751,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
   public void createPackageContents()
   {
     if (isCreated)
-    {
       return;
-    }
     isCreated = true;
 
     // Create classes and their features
@@ -842,9 +838,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
   public void initializePackageContents()
   {
     if (isInitialized)
-    {
       return;
-    }
     isInitialized = true;
 
     // Initialize package
@@ -857,19 +851,19 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
     // Set bounds for type parameters
 
     // Add supertypes to classes
-    stockProductEClass.getESuperTypes().add(getProduct());
-    recipeEClass.getESuperTypes().add(getProduct());
-    departmentEClass.getESuperTypes().add(getStation());
-    tableEClass.getESuperTypes().add(getStation());
+    stockProductEClass.getESuperTypes().add(this.getProduct());
+    recipeEClass.getESuperTypes().add(this.getProduct());
+    departmentEClass.getESuperTypes().add(this.getStation());
+    tableEClass.getESuperTypes().add(this.getStation());
 
     // Initialize classes and features; add operations and parameters
     initEClass(stockEClass, Stock.class, "Stock", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getStock_Products(), getStockProduct(), getStockProduct_Stock(), "products", null, 0, -1,
+    initEReference(getStock_Products(), this.getStockProduct(), this.getStockProduct_Stock(), "products", null, 0, -1,
         Stock.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getStock_Name(), ecorePackage.getEString(), "name", null, 0, 1, Stock.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getStock_Department(), getDepartment(), getDepartment_Stocks(), "department", null, 1, 1,
+    initEReference(getStock_Department(), this.getDepartment(), this.getDepartment_Stocks(), "department", null, 1, 1,
         Stock.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -881,9 +875,9 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
     initEClass(stockProductEClass, StockProduct.class, "StockProduct", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getStockProduct_Stock(), getStock(), getStock_Products(), "stock", null, 1, 1, StockProduct.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getStockProduct_Stock(), this.getStock(), this.getStock_Products(), "stock", null, 1, 1,
+        StockProduct.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getStockProduct_Cost(), ecorePackage.getEFloat(), "cost", null, 0, 1, StockProduct.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getStockProduct_Available(), ecorePackage.getEInt(), "available", null, 0, 1, StockProduct.class,
@@ -892,33 +886,33 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(recipeEClass, Recipe.class, "Recipe", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRecipe_Ingredients(), getIngredient(), getIngredient_Recipe(), "ingredients", null, 0, -1,
-        Recipe.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRecipe_Department(), getDepartment(), getDepartment_Recipes(), "department", null, 0, 1,
-        Recipe.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRecipe_Ingredients(), this.getIngredient(), this.getIngredient_Recipe(), "ingredients", null, 0,
+        -1, Recipe.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRecipe_Department(), this.getDepartment(), this.getDepartment_Recipes(), "department", null, 0,
+        1, Recipe.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getRecipe_Cost(), ecorePackage.getEFloat(), "cost", null, 0, 1, Recipe.class, IS_TRANSIENT,
         IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 
     initEClass(ingredientEClass, Ingredient.class, "Ingredient", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIngredient_Recipe(), getRecipe(), getRecipe_Ingredients(), "recipe", null, 1, 1,
+    initEReference(getIngredient_Recipe(), this.getRecipe(), this.getRecipe_Ingredients(), "recipe", null, 1, 1,
         Ingredient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getIngredient_Product(), getProduct(), null, "product", null, 1, 1, Ingredient.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getIngredient_Product(), this.getProduct(), null, "product", null, 1, 1, Ingredient.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
     initEAttribute(getIngredient_Quantity(), ecorePackage.getEInt(), "quantity", null, 0, 1, Ingredient.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(menuCardEClass, MenuCard.class, "MenuCard", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getMenuCard_Title(), ecorePackage.getEString(), "title", null, 0, 1, MenuCard.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMenuCard_Restaurant(), getRestaurant(), getRestaurant_MenuCards(), "restaurant", null, 1, 1,
-        MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getMenuCard_Sections(), getSection(), getSection_MenuCard(), "sections", null, 1, -1,
+    initEReference(getMenuCard_Restaurant(), this.getRestaurant(), this.getRestaurant_MenuCards(), "restaurant", null,
+        1, 1, MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMenuCard_Sections(), this.getSection(), this.getSection_MenuCard(), "sections", null, 1, -1,
         MenuCard.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -926,59 +920,59 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getRestaurant_Name(), ecorePackage.getEString(), "name", null, 0, 1, Restaurant.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRestaurant_Departments(), getDepartment(), getDepartment_Restaurant(), "departments", null, 0,
+    initEReference(getRestaurant_Departments(), this.getDepartment(), this.getDepartment_Restaurant(), "departments",
+        null, 0, -1, Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRestaurant_MenuCards(), this.getMenuCard(), this.getMenuCard_Restaurant(), "menuCards", null, 0,
         -1, Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRestaurant_MenuCards(), getMenuCard(), getMenuCard_Restaurant(), "menuCards", null, 0, -1,
+    initEReference(getRestaurant_Tables(), this.getTable(), this.getTable_Restaurant(), "tables", null, 0, -1,
         Restaurant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRestaurant_Tables(), getTable(), getTable_Restaurant(), "tables", null, 0, -1, Restaurant.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getRestaurant_Stations(), getStation(), null, "stations", null, 0, -1, Restaurant.class,
+    initEReference(getRestaurant_Stations(), this.getStation(), null, "stations", null, 0, -1, Restaurant.class,
         IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         IS_DERIVED, IS_ORDERED);
 
     initEClass(departmentEClass, Department.class, "Department", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getDepartment_Recipes(), getRecipe(), getRecipe_Department(), "recipes", null, 0, -1,
+    initEReference(getDepartment_Recipes(), this.getRecipe(), this.getRecipe_Department(), "recipes", null, 0, -1,
         Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getDepartment_Restaurant(), getRestaurant(), getRestaurant_Departments(), "restaurant", null, 1, 1,
-        Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+    initEReference(getDepartment_Restaurant(), this.getRestaurant(), this.getRestaurant_Departments(), "restaurant",
+        null, 1, 1, Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getDepartment_Employees(), this.getEmployee(), this.getEmployee_Department(), "employees", null, 0,
+        -1, Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getDepartment_Employees(), getEmployee(), getEmployee_Department(), "employees", null, 0, -1,
+    initEReference(getDepartment_Stocks(), this.getStock(), this.getStock_Department(), "stocks", null, 1, -1,
         Department.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getDepartment_Stocks(), getStock(), getStock_Department(), "stocks", null, 1, -1, Department.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
 
     initEClass(offeringEClass, Offering.class, "Offering", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOffering_Product(), getProduct(), null, "product", null, 1, 1, Offering.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getOffering_Product(), this.getProduct(), null, "product", null, 1, 1, Offering.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
     initEAttribute(getOffering_Name(), ecorePackage.getEString(), "name", null, 0, 1, Offering.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getOffering_Description(), ecorePackage.getEString(), "description", null, 0, 1, Offering.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getOffering_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, Offering.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getOffering_Section(), getSection(), getSection_Offerings(), "section", null, 1, 1, Offering.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getOffering_Section(), this.getSection(), this.getSection_Offerings(), "section", null, 1, 1,
+        Offering.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(tableEClass, Table.class, "Table", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getTable_Seats(), ecorePackage.getEInt(), "seats", null, 0, 1, Table.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getTable_Restaurant(), getRestaurant(), getRestaurant_Tables(), "restaurant", null, 1, 1,
+    initEReference(getTable_Restaurant(), this.getRestaurant(), this.getRestaurant_Tables(), "restaurant", null, 1, 1,
         Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(employeeEClass, Employee.class, "Employee", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getEmployee_Department(), getDepartment(), getDepartment_Employees(), "department", null, 0, 1,
-        Employee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getEmployee_Department(), this.getDepartment(), this.getDepartment_Employees(), "department", null,
+        0, 1, Employee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getEmployee_Name(), ecorePackage.getEString(), "name", null, 0, 1, Employee.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -987,10 +981,10 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(sectionEClass, Section.class, "Section", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getSection_MenuCard(), getMenuCard(), getMenuCard_Sections(), "menuCard", null, 1, 1, Section.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
-    initEReference(getSection_Offerings(), getOffering(), getOffering_Section(), "offerings", null, 1, -1,
+    initEReference(getSection_MenuCard(), this.getMenuCard(), this.getMenuCard_Sections(), "menuCard", null, 1, 1,
+        Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getSection_Offerings(), this.getOffering(), this.getOffering_Section(), "offerings", null, 1, -1,
         Section.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getSection_Title(), ecorePackage.getEString(), "title", null, 0, 1, Section.class, !IS_TRANSIENT,
author	Eike Stepper	2011-09-25 08:23:58 +0000
committer	Eike Stepper	2011-09-25 08:23:58 +0000
commit	53f0bebdc539db62a911cc27dff34cd49e135ee2 (patch)
tree	a34440a27b6385077fa072e2ecd68c392e83818b
parent	e324acc45cf0942c7972a6a496b75c45418b982d (diff)
download	cdo-53f0bebdc539db62a911cc27dff34cd49e135ee2.tar.gz cdo-53f0bebdc539db62a911cc27dff34cd49e135ee2.tar.xz cdo-53f0bebdc539db62a911cc27dff34cd49e135ee2.zip