Upgraded all models

10 files changed, 219 insertions, 314 deletions

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 9bdb84d0e1..5a8bdba33a 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 2fc45c561e..ebaae11e1a 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 90710e7f98..42836e783c 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 e141886bf0..c7401a6a04 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 b811c0abc3..1359cc551e 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,8 +182,7 @@ 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));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDOUIDefsPackage.CDO_EDITOR_DEF__CDO_VIEW, oldCdoView, cdoView));
       }
     }
     return cdoView;
@@ -194,7 +190,6 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOViewDef basicGetCdoView()
@@ -204,7 +199,6 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setCdoView(CDOViewDef newCdoView)
@@ -212,13 +206,11 @@ 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));
+      eNotify(new ENotificationImpl(this, Notification.SET, CDOUIDefsPackage.CDO_EDITOR_DEF__CDO_VIEW, oldCdoView, cdoView));
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String getResourcePath()
@@ -228,7 +220,6 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public void setResourcePath(String newResourcePath)
@@ -236,13 +227,11 @@ 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));
+      eNotify(new ENotificationImpl(this, Notification.SET, CDOUIDefsPackage.CDO_EDITOR_DEF__RESOURCE_PATH, oldResourcePath, resourcePath));
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -250,19 +239,17 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
   {
     switch (featureID)
     {
-    case CDOUIDefsPackage.CDO_EDITOR_DEF__CDO_VIEW:
-      if (resolve)
-        return getCdoView();
-      return basicGetCdoView();
-    case CDOUIDefsPackage.CDO_EDITOR_DEF__RESOURCE_PATH:
-      return getResourcePath();
+      case CDOUIDefsPackage.CDO_EDITOR_DEF__CDO_VIEW:
+        if (resolve) return getCdoView();
+        return basicGetCdoView();
+      case CDOUIDefsPackage.CDO_EDITOR_DEF__RESOURCE_PATH:
+        return getResourcePath();
     }
     return super.eGet(featureID, resolve, coreType);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -270,19 +257,18 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
   {
     switch (featureID)
     {
-    case CDOUIDefsPackage.CDO_EDITOR_DEF__CDO_VIEW:
-      setCdoView((CDOViewDef)newValue);
-      return;
-    case CDOUIDefsPackage.CDO_EDITOR_DEF__RESOURCE_PATH:
-      setResourcePath((String)newValue);
-      return;
+      case CDOUIDefsPackage.CDO_EDITOR_DEF__CDO_VIEW:
+        setCdoView((CDOViewDef)newValue);
+        return;
+      case CDOUIDefsPackage.CDO_EDITOR_DEF__RESOURCE_PATH:
+        setResourcePath((String)newValue);
+        return;
     }
     super.eSet(featureID, newValue);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -290,19 +276,18 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
   {
     switch (featureID)
     {
-    case CDOUIDefsPackage.CDO_EDITOR_DEF__CDO_VIEW:
-      setCdoView((CDOViewDef)null);
-      return;
-    case CDOUIDefsPackage.CDO_EDITOR_DEF__RESOURCE_PATH:
-      setResourcePath(RESOURCE_PATH_EDEFAULT);
-      return;
+      case CDOUIDefsPackage.CDO_EDITOR_DEF__CDO_VIEW:
+        setCdoView((CDOViewDef)null);
+        return;
+      case CDOUIDefsPackage.CDO_EDITOR_DEF__RESOURCE_PATH:
+        setResourcePath(RESOURCE_PATH_EDEFAULT);
+        return;
     }
     super.eUnset(featureID);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -310,24 +295,22 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
   {
     switch (featureID)
     {
-    case CDOUIDefsPackage.CDO_EDITOR_DEF__CDO_VIEW:
-      return cdoView != null;
-    case CDOUIDefsPackage.CDO_EDITOR_DEF__RESOURCE_PATH:
-      return RESOURCE_PATH_EDEFAULT == null ? resourcePath != null : !RESOURCE_PATH_EDEFAULT.equals(resourcePath);
+      case CDOUIDefsPackage.CDO_EDITOR_DEF__CDO_VIEW:
+        return cdoView != null;
+      case CDOUIDefsPackage.CDO_EDITOR_DEF__RESOURCE_PATH:
+        return RESOURCE_PATH_EDEFAULT == null ? resourcePath != null : !RESOURCE_PATH_EDEFAULT.equals(resourcePath);
     }
     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(" (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 8adbd40ecd..7edf1c1a22 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
@@ -24,22 +24,20 @@ 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()
   {
     try
     {
-      CDOUIDefsFactory theCDOUIDefsFactory = (CDOUIDefsFactory)EPackage.Registry.INSTANCE
-          .getEFactory("http://www.eclipse.org/emf/CDO/ui/defs/1.0.0");
+      CDOUIDefsFactory theCDOUIDefsFactory = (CDOUIDefsFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/CDO/ui/defs/1.0.0"); 
       if (theCDOUIDefsFactory != null)
       {
         return theCDOUIDefsFactory;
@@ -53,8 +51,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()
@@ -64,7 +62,6 @@ public class CDOUIDefsFactoryImpl extends EFactoryImpl implements CDOUIDefsFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -72,18 +69,15 @@ public class CDOUIDefsFactoryImpl extends EFactoryImpl implements CDOUIDefsFacto
   {
     switch (eClass.getClassifierID())
     {
-    case CDOUIDefsPackage.EDITOR_DEF:
-      return createEditorDef();
-    case CDOUIDefsPackage.CDO_EDITOR_DEF:
-      return createCDOEditorDef();
-    default:
-      throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+      case CDOUIDefsPackage.EDITOR_DEF: return createEditorDef();
+      case CDOUIDefsPackage.CDO_EDITOR_DEF: return createCDOEditorDef();
+      default:
+        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EditorDef createEditorDef()
@@ -94,7 +88,6 @@ public class CDOUIDefsFactoryImpl extends EFactoryImpl implements CDOUIDefsFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOEditorDef createCDOEditorDef()
@@ -105,7 +98,6 @@ public class CDOUIDefsFactoryImpl extends EFactoryImpl implements CDOUIDefsFacto
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOUIDefsPackage getCDOUIDefsPackage()
@@ -115,7 +107,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 f2b114d696..efbd6b7edc 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,24 +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.
-   * Simple dependencies are satisfied by calling this method on all dependent packages before doing anything else. This
-   * method drives initialization for interdependent packages directly, in parallel with this package, itself.
-   * <p>
-   * Of this package and its interdependencies, all packages which have not yet been registered by their URI values are
-   * first created and registered. The packages are then initialized in two steps: meta-model objects for all of the
-   * packages are created before any are initialized, since one package's meta-model objects may refer to those of
-   * another.
-   * <p>
-   * Invocation of this method will not affect any packages that have already been initialized. <!-- 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()
@@ -91,13 +81,10 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
    */
   public static CDOUIDefsPackage init()
   {
-    if (isInited)
-      return (CDOUIDefsPackage)EPackage.Registry.INSTANCE.getEPackage(CDOUIDefsPackage.eNS_URI);
+    if (isInited) return (CDOUIDefsPackage)EPackage.Registry.INSTANCE.getEPackage(CDOUIDefsPackage.eNS_URI);
 
     // Obtain or create and register package
-    CDOUIDefsPackageImpl theCDOUIDefsPackage = (CDOUIDefsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof CDOUIDefsPackageImpl ? EPackage.Registry.INSTANCE
-        .getEPackage(eNS_URI)
-        : new CDOUIDefsPackageImpl());
+    CDOUIDefsPackageImpl theCDOUIDefsPackage = (CDOUIDefsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CDOUIDefsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new CDOUIDefsPackageImpl());
 
     isInited = true;
 
@@ -113,12 +100,14 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
     // Mark meta-data to indicate it can't be changed
     theCDOUIDefsPackage.freeze();
 
+  
+    // Update the registry and return the package
+    EPackage.Registry.INSTANCE.put(CDOUIDefsPackage.eNS_URI, theCDOUIDefsPackage);
     return theCDOUIDefsPackage;
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getEditorDef()
@@ -128,7 +117,6 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getEditorDef_EditorID()
@@ -138,7 +126,6 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getCDOEditorDef()
@@ -148,7 +135,6 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getCDOEditorDef_CdoView()
@@ -158,7 +144,6 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getCDOEditorDef_ResourcePath()
@@ -168,7 +153,6 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public CDOUIDefsFactory getCDOUIDefsFactory()
@@ -178,21 +162,19 @@ 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;
+    if (isCreated) return;
     isCreated = true;
 
     // Create classes and their features
@@ -206,21 +188,19 @@ 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;
+    if (isInitialized) return;
     isInitialized = true;
 
     // Initialize package
@@ -229,8 +209,7 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
     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);
     CDODefsPackage theCDODefsPackage = (CDODefsPackage)EPackage.Registry.INSTANCE.getEPackage(CDODefsPackage.eNS_URI);
 
     // Create type parameters
@@ -243,17 +222,11 @@ public class CDOUIDefsPackageImpl extends EPackageImpl implements CDOUIDefsPacka
 
     // Initialize classes and features; add operations and parameters
     initEClass(editorDefEClass, EditorDef.class, "EditorDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getEditorDef_EditorID(), ecorePackage.getEString(), "editorID", null, 1, 1, EditorDef.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(cdoEditorDefEClass, CDOEditorDef.class, "CDOEditorDef", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCDOEditorDef_CdoView(), theCDODefsPackage.getCDOViewDef(), null, "cdoView", null, 1, 1,
-        CDOEditorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getCDOEditorDef_ResourcePath(), ecorePackage.getEString(), "resourcePath", null, 1, 1,
-        CDOEditorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEAttribute(getEditorDef_EditorID(), ecorePackage.getEString(), "editorID", null, 1, 1, EditorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(cdoEditorDefEClass, CDOEditorDef.class, "CDOEditorDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getCDOEditorDef_CdoView(), theCDODefsPackage.getCDOViewDef(), null, "cdoView", null, 1, 1, CDOEditorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCDOEditorDef_ResourcePath(), ecorePackage.getEString(), "resourcePath", null, 1, 1, CDOEditorDef.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.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 7f464eb6a6..6973a276cf 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,13 +91,11 @@ 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));
+      eNotify(new ENotificationImpl(this, Notification.SET, CDOUIDefsPackage.EDITOR_DEF__EDITOR_ID, oldEditorID, editorID));
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -109,15 +103,14 @@ public class EditorDefImpl extends DefImpl implements EditorDef
   {
     switch (featureID)
     {
-    case CDOUIDefsPackage.EDITOR_DEF__EDITOR_ID:
-      return getEditorID();
+      case CDOUIDefsPackage.EDITOR_DEF__EDITOR_ID:
+        return getEditorID();
     }
     return super.eGet(featureID, resolve, coreType);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -125,16 +118,15 @@ public class EditorDefImpl extends DefImpl implements EditorDef
   {
     switch (featureID)
     {
-    case CDOUIDefsPackage.EDITOR_DEF__EDITOR_ID:
-      setEditorID((String)newValue);
-      return;
+      case CDOUIDefsPackage.EDITOR_DEF__EDITOR_ID:
+        setEditorID((String)newValue);
+        return;
     }
     super.eSet(featureID, newValue);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -142,16 +134,15 @@ public class EditorDefImpl extends DefImpl implements EditorDef
   {
     switch (featureID)
     {
-    case CDOUIDefsPackage.EDITOR_DEF__EDITOR_ID:
-      setEditorID(EDITOR_ID_EDEFAULT);
-      return;
+      case CDOUIDefsPackage.EDITOR_DEF__EDITOR_ID:
+        setEditorID(EDITOR_ID_EDEFAULT);
+        return;
     }
     super.eUnset(featureID);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -159,22 +150,20 @@ public class EditorDefImpl extends DefImpl implements EditorDef
   {
     switch (featureID)
     {
-    case CDOUIDefsPackage.EDITOR_DEF__EDITOR_ID:
-      return EDITOR_ID_EDEFAULT == null ? editorID != null : !EDITOR_ID_EDEFAULT.equals(editorID);
+      case CDOUIDefsPackage.EDITOR_DEF__EDITOR_ID:
+        return EDITOR_ID_EDEFAULT == null ? editorID != null : !EDITOR_ID_EDEFAULT.equals(editorID);
     }
     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(" (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 6542fa55d1..02565dab09 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
@@ -25,22 +25,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()
@@ -52,10 +51,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
    */
@@ -74,42 +73,38 @@ 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>()
-  {
-    @Override
-    public Adapter caseEditorDef(EditorDef object)
-    {
-      return createEditorDefAdapter();
-    }
-
-    @Override
-    public Adapter caseCDOEditorDef(CDOEditorDef object)
-    {
-      return createCDOEditorDefAdapter();
-    }
-
-    @Override
-    public Adapter caseDef(Def object)
-    {
-      return createDefAdapter();
-    }
-
-    @Override
-    public Adapter defaultCase(EObject object)
     {
-      return createEObjectAdapter();
-    }
-  };
+      @Override
+      public Adapter caseEditorDef(EditorDef object)
+      {
+        return createEditorDefAdapter();
+      }
+      @Override
+      public Adapter caseCDOEditorDef(CDOEditorDef object)
+      {
+        return createCDOEditorDefAdapter();
+      }
+      @Override
+      public Adapter caseDef(Def object)
+      {
+        return createDefAdapter();
+      }
+      @Override
+      public Adapter defaultCase(EObject object)
+      {
+        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
    */
@@ -123,7 +118,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
@@ -134,10 +128,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
@@ -162,9 +155,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.defs/src/org/eclipse/emf/cdo/ui/defs/util/CDOUIDefsSwitch.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/util/CDOUIDefsSwitch.java
index 4036d53563..f3cea3e4ab 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/util/CDOUIDefsSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/util/CDOUIDefsSwitch.java
@@ -27,22 +27,21 @@ 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.emf.cdo.ui.defs.CDOUIDefsPackage
  * @generated
  */
 public class CDOUIDefsSwitch<T>
 {
   /**
-   * 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 switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Creates an instance of the switch.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   public CDOUIDefsSwitch()
@@ -56,7 +55,6 @@ public class CDOUIDefsSwitch<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
    */
@@ -68,7 +66,6 @@ public class CDOUIDefsSwitch<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
    */
@@ -81,14 +78,16 @@ public class CDOUIDefsSwitch<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
    */
@@ -96,39 +95,32 @@ public class CDOUIDefsSwitch<T>
   {
     switch (classifierID)
     {
-    case CDOUIDefsPackage.EDITOR_DEF:
-    {
-      EditorDef editorDef = (EditorDef)theEObject;
-      T result = caseEditorDef(editorDef);
-      if (result == null)
-        result = caseDef(editorDef);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case CDOUIDefsPackage.CDO_EDITOR_DEF:
-    {
-      CDOEditorDef cdoEditorDef = (CDOEditorDef)theEObject;
-      T result = caseCDOEditorDef(cdoEditorDef);
-      if (result == null)
-        result = caseEditorDef(cdoEditorDef);
-      if (result == null)
-        result = caseDef(cdoEditorDef);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    default:
-      return defaultCase(theEObject);
+      case CDOUIDefsPackage.EDITOR_DEF:
+      {
+        EditorDef editorDef = (EditorDef)theEObject;
+        T result = caseEditorDef(editorDef);
+        if (result == null) result = caseDef(editorDef);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      case CDOUIDefsPackage.CDO_EDITOR_DEF:
+      {
+        CDOEditorDef cdoEditorDef = (CDOEditorDef)theEObject;
+        T result = caseCDOEditorDef(cdoEditorDef);
+        if (result == null) result = caseEditorDef(cdoEditorDef);
+        if (result == null) result = caseDef(cdoEditorDef);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      default: return defaultCase(theEObject);
     }
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Editor Def</em>'. <!-- begin-user-doc --> This
+   * Returns the result of interpreting the object as an instance of '<em>Editor 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>Editor Def</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -139,11 +131,10 @@ public class CDOUIDefsSwitch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>CDO Editor Def</em>'. <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>CDO Editor 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>CDO Editor Def</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -154,11 +145,10 @@ public class CDOUIDefsSwitch<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
@@ -169,12 +159,11 @@ public class CDOUIDefsSwitch<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