regenerated all models

9 files changed, 233 insertions, 157 deletions

diff --git a/plugins/org.eclipse.net4j.tests/.classpath b/plugins/org.eclipse.net4j.tests/.classpath
index 304e86186a..aa30c2ea48 100644
--- a/plugins/org.eclipse.net4j.tests/.classpath
+++ b/plugins/org.eclipse.net4j.tests/.classpath
@@ -3,5 +3,25 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" kind="var" path="ECLIPSE_CORE_RUNTIME">
+		<attributes>
+			<attribute name="plugin_id" value="org.eclipse.core.runtime"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="var" path="ECLIPSE_CORE_RESOURCES">
+		<attributes>
+			<attribute name="plugin_id" value="org.eclipse.core.resources"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="var" path="EMF_COMMON">
+		<attributes>
+			<attribute name="plugin_id" value="org.eclipse.emf.common"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="var" path="EMF_ECORE">
+		<attributes>
+			<attribute name="plugin_id" value="org.eclipse.emf.ecore"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDef.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDef.java
index caee5a35cf..52d2071abd 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDef.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDef.java
@@ -17,15 +17,14 @@ import org.eclipse.emf.common.util.EList;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Test Def</b></em>'. <!-- end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.net4j.util.tests.defs.TestDef#getReferences <em>References</em>}</li>
- *   <li>{@link org.eclipse.net4j.util.tests.defs.TestDef#getAttribute <em>Attribute</em>}</li>
+ * <li>{@link org.eclipse.net4j.util.tests.defs.TestDef#getReferences <em>References</em>}</li>
+ * <li>{@link org.eclipse.net4j.util.tests.defs.TestDef#getAttribute <em>Attribute</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.net4j.util.tests.defs.TestDefsPackage#getTestDef()
  * @model
  * @generated
@@ -33,14 +32,14 @@ import org.eclipse.emf.common.util.EList;
 public interface TestDef extends Def
 {
   /**
-   * Returns the value of the '<em><b>References</b></em>' 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>References</b></em>' 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>References</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>References</em>' reference list.
    * @see org.eclipse.net4j.util.tests.defs.TestDefsPackage#getTestDef_References()
    * @model
@@ -49,13 +48,13 @@ public interface TestDef extends Def
   EList<Def> getReferences();
 
   /**
-   * Returns the value of the '<em><b>Attribute</b></em>' attribute.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Attribute</b></em>' attribute. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Attribute</em>' attribute isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Attribute</em>' attribute.
    * @see #setAttribute(String)
    * @see org.eclipse.net4j.util.tests.defs.TestDefsPackage#getTestDef_Attribute()
@@ -65,9 +64,11 @@ public interface TestDef extends Def
   String getAttribute();
 
   /**
-   * Sets the value of the '{@link org.eclipse.net4j.util.tests.defs.TestDef#getAttribute <em>Attribute</em>}' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Attribute</em>' attribute.
+   * Sets the value of the '{@link org.eclipse.net4j.util.tests.defs.TestDef#getAttribute <em>Attribute</em>}'
+   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Attribute</em>' attribute.
    * @see #getAttribute()
    * @generated
    */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefsFactory.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefsFactory.java
index 6324055161..6d5d68791c 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefsFactory.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefsFactory.java
@@ -16,29 +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.util.tests.defs.TestDefsPackage
  * @generated
  */
 public interface TestDefsFactory 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
    */
   TestDefsFactory eINSTANCE = org.eclipse.net4j.util.tests.defs.impl.TestDefsFactoryImpl.init();
 
   /**
-   * Returns a new object of class '<em>Test Def</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns a new object of class '<em>Test Def</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return a new object of class '<em>Test Def</em>'.
    * @generated
    */
   TestDef createTestDef();
 
   /**
-   * 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.tests/src/org/eclipse/net4j/util/tests/defs/TestDefsPackage.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefsPackage.java
index cbbd1a3c6f..27c66ce673 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefsPackage.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefsPackage.java
@@ -27,6 +27,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.net4j.util.tests.defs.TestDefsFactory
  * @model kind="package"
  * @generated
@@ -34,29 +35,29 @@ import org.eclipse.emf.ecore.EReference;
 public interface TestDefsPackage 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/tests/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.tests"; //$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
    */
   TestDefsPackage eINSTANCE = org.eclipse.net4j.util.tests.defs.impl.TestDefsPackageImpl.init();
@@ -64,6 +65,7 @@ public interface TestDefsPackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.net4j.util.tests.defs.impl.TestDefImpl <em>Test Def</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.net4j.util.tests.defs.impl.TestDefImpl
    * @see org.eclipse.net4j.util.tests.defs.impl.TestDefsPackageImpl#getTestDef()
    * @generated
@@ -71,24 +73,24 @@ public interface TestDefsPackage extends EPackage
   int TEST_DEF = 0;
 
   /**
-   * The feature id for the '<em><b>References</b></em>' reference list.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>References</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int TEST_DEF__REFERENCES = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 0;
 
   /**
-   * The feature id for the '<em><b>Attribute</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Attribute</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int TEST_DEF__ATTRIBUTE = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
 
   /**
-   * The number of structural features of the '<em>Test Def</em>' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The number of structural features of the '<em>Test Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
@@ -105,8 +107,9 @@ public interface TestDefsPackage extends EPackage
   EClass getTestDef();
 
   /**
-   * Returns the meta object for the reference list '{@link org.eclipse.net4j.util.tests.defs.TestDef#getReferences <em>References</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the reference list '{@link org.eclipse.net4j.util.tests.defs.TestDef#getReferences
+   * <em>References</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the reference list '<em>References</em>'.
    * @see org.eclipse.net4j.util.tests.defs.TestDef#getReferences()
    * @see #getTestDef()
@@ -115,8 +118,9 @@ public interface TestDefsPackage extends EPackage
   EReference getTestDef_References();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.net4j.util.tests.defs.TestDef#getAttribute <em>Attribute</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.net4j.util.tests.defs.TestDef#getAttribute
+   * <em>Attribute</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the attribute '<em>Attribute</em>'.
    * @see org.eclipse.net4j.util.tests.defs.TestDef#getAttribute()
    * @see #getTestDef()
@@ -125,8 +129,8 @@ public interface TestDefsPackage extends EPackage
   EAttribute getTestDef_Attribute();
 
   /**
-   * 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
    */
@@ -141,13 +145,15 @@ public interface TestDefsPackage 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.tests.defs.impl.TestDefImpl <em>Test Def</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.net4j.util.tests.defs.impl.TestDefImpl <em>Test Def</em>}'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.net4j.util.tests.defs.impl.TestDefImpl
      * @see org.eclipse.net4j.util.tests.defs.impl.TestDefsPackageImpl#getTestDef()
      * @generated
@@ -155,17 +161,17 @@ public interface TestDefsPackage extends EPackage
     EClass TEST_DEF = eINSTANCE.getTestDef();
 
     /**
-     * The meta object literal for the '<em><b>References</b></em>' reference list feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>References</b></em>' reference list feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EReference TEST_DEF__REFERENCES = eINSTANCE.getTestDef_References();
 
     /**
-     * The meta object literal for the '<em><b>Attribute</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Attribute</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EAttribute TEST_DEF__ATTRIBUTE = eINSTANCE.getTestDef_Attribute();
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefImpl.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefImpl.java
index 6bea0c577f..1ad5b3e4da 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefImpl.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefImpl.java
@@ -29,19 +29,19 @@ import java.util.Collection;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.net4j.util.tests.defs.impl.TestDefImpl#getReferences <em>References</em>}</li>
- *   <li>{@link org.eclipse.net4j.util.tests.defs.impl.TestDefImpl#getAttribute <em>Attribute</em>}</li>
+ * <li>{@link org.eclipse.net4j.util.tests.defs.impl.TestDefImpl#getReferences <em>References</em>}</li>
+ * <li>{@link org.eclipse.net4j.util.tests.defs.impl.TestDefImpl#getAttribute <em>Attribute</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class TestDefImpl extends DefImpl implements TestDef
 {
   /**
-   * The cached value of the '{@link #getReferences() <em>References</em>}' reference list.
-   * <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getReferences() <em>References</em>}' reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @see #getReferences()
    * @generated
    * @ordered
@@ -49,9 +49,9 @@ public class TestDefImpl extends DefImpl implements TestDef
   protected EList<Def> references;
 
   /**
-   * The default value of the '{@link #getAttribute() <em>Attribute</em>}' attribute.
-   * <!-- begin-user-doc --> <!--
+   * The default value of the '{@link #getAttribute() <em>Attribute</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @see #getAttribute()
    * @generated
    * @ordered
@@ -59,9 +59,9 @@ public class TestDefImpl extends DefImpl implements TestDef
   protected static final String ATTRIBUTE_EDEFAULT = null;
 
   /**
-   * The cached value of the '{@link #getAttribute() <em>Attribute</em>}' attribute.
-   * <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getAttribute() <em>Attribute</em>}' attribute. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @see #getAttribute()
    * @generated
    * @ordered
@@ -70,6 +70,7 @@ public class TestDefImpl extends DefImpl implements TestDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected TestDefImpl()
@@ -79,6 +80,7 @@ public class TestDefImpl extends DefImpl implements TestDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -89,6 +91,7 @@ public class TestDefImpl extends DefImpl implements TestDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EList<Def> getReferences()
@@ -102,6 +105,7 @@ public class TestDefImpl extends DefImpl implements TestDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public String getAttribute()
@@ -111,6 +115,7 @@ public class TestDefImpl extends DefImpl implements TestDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setAttribute(String newAttribute)
@@ -118,11 +123,13 @@ public class TestDefImpl extends DefImpl implements TestDef
     String oldAttribute = attribute;
     attribute = newAttribute;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, TestDefsPackage.TEST_DEF__ATTRIBUTE, oldAttribute, attribute));
+      eNotify(new ENotificationImpl(this, Notification.SET, TestDefsPackage.TEST_DEF__ATTRIBUTE, oldAttribute,
+          attribute));
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -130,16 +137,17 @@ public class TestDefImpl extends DefImpl implements TestDef
   {
     switch (featureID)
     {
-      case TestDefsPackage.TEST_DEF__REFERENCES:
-        return getReferences();
-      case TestDefsPackage.TEST_DEF__ATTRIBUTE:
-        return getAttribute();
+    case TestDefsPackage.TEST_DEF__REFERENCES:
+      return getReferences();
+    case TestDefsPackage.TEST_DEF__ATTRIBUTE:
+      return getAttribute();
     }
     return super.eGet(featureID, resolve, coreType);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -148,19 +156,20 @@ public class TestDefImpl extends DefImpl implements TestDef
   {
     switch (featureID)
     {
-      case TestDefsPackage.TEST_DEF__REFERENCES:
-        getReferences().clear();
-        getReferences().addAll((Collection<? extends Def>)newValue);
-        return;
-      case TestDefsPackage.TEST_DEF__ATTRIBUTE:
-        setAttribute((String)newValue);
-        return;
+    case TestDefsPackage.TEST_DEF__REFERENCES:
+      getReferences().clear();
+      getReferences().addAll((Collection<? extends Def>)newValue);
+      return;
+    case TestDefsPackage.TEST_DEF__ATTRIBUTE:
+      setAttribute((String)newValue);
+      return;
     }
     super.eSet(featureID, newValue);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -168,18 +177,19 @@ public class TestDefImpl extends DefImpl implements TestDef
   {
     switch (featureID)
     {
-      case TestDefsPackage.TEST_DEF__REFERENCES:
-        getReferences().clear();
-        return;
-      case TestDefsPackage.TEST_DEF__ATTRIBUTE:
-        setAttribute(ATTRIBUTE_EDEFAULT);
-        return;
+    case TestDefsPackage.TEST_DEF__REFERENCES:
+      getReferences().clear();
+      return;
+    case TestDefsPackage.TEST_DEF__ATTRIBUTE:
+      setAttribute(ATTRIBUTE_EDEFAULT);
+      return;
     }
     super.eUnset(featureID);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -187,22 +197,24 @@ public class TestDefImpl extends DefImpl implements TestDef
   {
     switch (featureID)
     {
-      case TestDefsPackage.TEST_DEF__REFERENCES:
-        return references != null && !references.isEmpty();
-      case TestDefsPackage.TEST_DEF__ATTRIBUTE:
-        return ATTRIBUTE_EDEFAULT == null ? attribute != null : !ATTRIBUTE_EDEFAULT.equals(attribute);
+    case TestDefsPackage.TEST_DEF__REFERENCES:
+      return references != null && !references.isEmpty();
+    case TestDefsPackage.TEST_DEF__ATTRIBUTE:
+      return ATTRIBUTE_EDEFAULT == null ? attribute != null : !ATTRIBUTE_EDEFAULT.equals(attribute);
     }
     return super.eIsSet(featureID);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
   public String toString()
   {
-    if (eIsProxy()) return super.toString();
+    if (eIsProxy())
+      return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (attribute: ");
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsFactoryImpl.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsFactoryImpl.java
index 193bb0d4dd..7e309d5bdf 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsFactoryImpl.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsFactoryImpl.java
@@ -23,20 +23,22 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class TestDefsFactoryImpl extends EFactoryImpl implements TestDefsFactory
 {
   /**
-   * 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 TestDefsFactory init()
   {
     try
     {
-      TestDefsFactory theTestDefsFactory = (TestDefsFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/NET4J/defs/tests/1.0.0"); 
+      TestDefsFactory theTestDefsFactory = (TestDefsFactory)EPackage.Registry.INSTANCE
+          .getEFactory("http://www.eclipse.org/NET4J/defs/tests/1.0.0");
       if (theTestDefsFactory != null)
       {
         return theTestDefsFactory;
@@ -50,8 +52,8 @@ public class TestDefsFactoryImpl extends EFactoryImpl implements TestDefsFactory
   }
 
   /**
-   * 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 TestDefsFactoryImpl()
@@ -61,6 +63,7 @@ public class TestDefsFactoryImpl extends EFactoryImpl implements TestDefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -68,14 +71,16 @@ public class TestDefsFactoryImpl extends EFactoryImpl implements TestDefsFactory
   {
     switch (eClass.getClassifierID())
     {
-      case TestDefsPackage.TEST_DEF: return createTestDef();
-      default:
-        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+    case TestDefsPackage.TEST_DEF:
+      return createTestDef();
+    default:
+      throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public TestDef createTestDef()
@@ -86,6 +91,7 @@ public class TestDefsFactoryImpl extends EFactoryImpl implements TestDefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public TestDefsPackage getTestDefsPackage()
@@ -95,6 +101,7 @@ public class TestDefsFactoryImpl extends EFactoryImpl implements TestDefsFactory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsPackageImpl.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsPackageImpl.java
index 2ede5bc681..33fefdfdf6 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsPackageImpl.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsPackageImpl.java
@@ -24,12 +24,14 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass testDefEClass = null;
@@ -54,17 +56,18 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
 
   /**
    * <!-- 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 TestDefsPackage#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 -->
+   * <p>
+   * This method is used to initialize {@link TestDefsPackage#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()
@@ -72,10 +75,13 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
    */
   public static TestDefsPackage init()
   {
-    if (isInited) return (TestDefsPackage)EPackage.Registry.INSTANCE.getEPackage(TestDefsPackage.eNS_URI);
+    if (isInited)
+      return (TestDefsPackage)EPackage.Registry.INSTANCE.getEPackage(TestDefsPackage.eNS_URI);
 
     // Obtain or create and register package
-    TestDefsPackageImpl theTestDefsPackage = (TestDefsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TestDefsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new TestDefsPackageImpl());
+    TestDefsPackageImpl theTestDefsPackage = (TestDefsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TestDefsPackageImpl ? EPackage.Registry.INSTANCE
+        .get(eNS_URI)
+        : new TestDefsPackageImpl());
 
     isInited = true;
 
@@ -91,7 +97,6 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
     // Mark meta-data to indicate it can't be changed
     theTestDefsPackage.freeze();
 
-  
     // Update the registry and return the package
     EPackage.Registry.INSTANCE.put(TestDefsPackage.eNS_URI, theTestDefsPackage);
     return theTestDefsPackage;
@@ -99,6 +104,7 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getTestDef()
@@ -108,6 +114,7 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getTestDef_References()
@@ -117,6 +124,7 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EAttribute getTestDef_Attribute()
@@ -126,6 +134,7 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public TestDefsFactory getTestDefsFactory()
@@ -135,19 +144,21 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
 
   /**
    * <!-- 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;
+    if (isCreated)
+      return;
     isCreated = true;
 
     // Create classes and their features
@@ -158,19 +169,21 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
 
   /**
    * <!-- 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;
+    if (isInitialized)
+      return;
     isInitialized = true;
 
     // Initialize package
@@ -179,7 +192,8 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
     setNsURI(eNS_URI);
 
     // Obtain other dependent packages
-    Net4jUtilDefsPackage theNet4jUtilDefsPackage = (Net4jUtilDefsPackage)EPackage.Registry.INSTANCE.getEPackage(Net4jUtilDefsPackage.eNS_URI);
+    Net4jUtilDefsPackage theNet4jUtilDefsPackage = (Net4jUtilDefsPackage)EPackage.Registry.INSTANCE
+        .getEPackage(Net4jUtilDefsPackage.eNS_URI);
 
     // Create type parameters
 
@@ -190,8 +204,11 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage
 
     // Initialize classes and features; add operations and parameters
     initEClass(testDefEClass, TestDef.class, "TestDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTestDef_References(), theNet4jUtilDefsPackage.getDef(), null, "references", null, 0, -1, TestDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getTestDef_Attribute(), ecorePackage.getEString(), "attribute", null, 0, 1, TestDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getTestDef_References(), theNet4jUtilDefsPackage.getDef(), null, "references", null, 0, -1,
+        TestDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getTestDef_Attribute(), ecorePackage.getEString(), "attribute", null, 0, 1, TestDef.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Create resource
     createResource(eNS_URI);
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/TestDefsAdapterFactory.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/TestDefsAdapterFactory.java
index c8c2b21985..c3984e7d6c 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/TestDefsAdapterFactory.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/TestDefsAdapterFactory.java
@@ -23,21 +23,22 @@ 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.tests.defs.TestDefsPackage
  * @generated
  */
 public class TestDefsAdapterFactory 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 TestDefsPackage 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 TestDefsAdapterFactory()
@@ -49,10 +50,10 @@ public class TestDefsAdapterFactory 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
    */
@@ -71,33 +72,36 @@ public class TestDefsAdapterFactory 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 TestDefsSwitch<Adapter> modelSwitch = new TestDefsSwitch<Adapter>()
+  {
+    @Override
+    public Adapter caseTestDef(TestDef object)
+    {
+      return createTestDefAdapter();
+    }
+
+    @Override
+    public Adapter caseDef(Def object)
+    {
+      return createDefAdapter();
+    }
+
+    @Override
+    public Adapter defaultCase(EObject object)
     {
-      @Override
-      public Adapter caseTestDef(TestDef object)
-      {
-        return createTestDefAdapter();
-      }
-      @Override
-      public Adapter caseDef(Def object)
-      {
-        return createDefAdapter();
-      }
-      @Override
-      public Adapter defaultCase(EObject object)
-      {
-        return createEObjectAdapter();
-      }
-    };
+      return createEObjectAdapter();
+    }
+  };
 
   /**
-   * 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
    */
@@ -111,6 +115,7 @@ public class TestDefsAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.tests.defs.TestDef <em>Test 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.tests.defs.TestDef
    * @generated
@@ -135,9 +140,9 @@ public class TestDefsAdapterFactory 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.tests/src/org/eclipse/net4j/util/tests/defs/util/TestDefsSwitch.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/TestDefsSwitch.java
index 43dca50e98..e1e2ae48a8 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/TestDefsSwitch.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/util/TestDefsSwitch.java
@@ -25,21 +25,22 @@ import java.util.List;
  * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
  * returned, which is the result of the switch. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.net4j.util.tests.defs.TestDefsPackage
  * @generated
  */
 public class TestDefsSwitch<T>
 {
   /**
-   * The cached model package
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected static TestDefsPackage modelPackage;
 
   /**
-   * Creates an instance of the switch.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public TestDefsSwitch()
@@ -53,6 +54,7 @@ public class TestDefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -64,6 +66,7 @@ public class TestDefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -76,16 +79,14 @@ public class TestDefsSwitch<T>
     else
     {
       List<EClass> eSuperTypes = theEClass.getESuperTypes();
-      return
-        eSuperTypes.isEmpty() ?
-          defaultCase(theEObject) :
-          doSwitch(eSuperTypes.get(0), theEObject);
+      return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), 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
    */
@@ -93,23 +94,27 @@ public class TestDefsSwitch<T>
   {
     switch (classifierID)
     {
-      case TestDefsPackage.TEST_DEF:
-      {
-        TestDef testDef = (TestDef)theEObject;
-        T result = caseTestDef(testDef);
-        if (result == null) result = caseDef(testDef);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      default: return defaultCase(theEObject);
+    case TestDefsPackage.TEST_DEF:
+    {
+      TestDef testDef = (TestDef)theEObject;
+      T result = caseTestDef(testDef);
+      if (result == null)
+        result = caseDef(testDef);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    default:
+      return defaultCase(theEObject);
     }
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Test Def</em>'.
-   * <!-- begin-user-doc --> This
+   * Returns the result of interpreting the object as an instance of '<em>Test Def</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Test Def</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -120,10 +125,11 @@ public class TestDefsSwitch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Def</em>'.
-   * <!-- begin-user-doc --> This
+   * Returns the result of interpreting the object as an instance of '<em>Def</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Def</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -134,11 +140,12 @@ public class TestDefsSwitch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-   * <!-- begin-user-doc --> This
+   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
    * anyway. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject)
    * @generated