upgrade to EMF 2.8drops/I20110925-0426

10 files changed, 126 insertions, 202 deletions

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
    */