[246623] Create Definition model as alternative configuration/wiring mechanism

https://bugs.eclipse.org/bugs/show_bug.cgi?id=246623

28 files changed, 1657 insertions, 1456 deletions

diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.ui.defs/.settings/org.eclipse.core.resources.prefs
index 6121790430..8441cb4da5 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,3 @@
-#Fri Dec 12 15:21:10 CET 2008
+#Tue Dec 30 18:28:09 CET 2008
 eclipse.preferences.version=1
 encoding//model/org.eclipse.emf.cdo.ui.defs.ecorediag=UTF-8
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.ui.defs/.settings/org.eclipse.jdt.core.prefs
index a006c51240..b1658e14fe 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,23 @@
-#Mon Dec 15 16:13:39 CET 2008
+#Wed Dec 31 15:41:22 CET 2008
 eclipse.preferences.version=1
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.ui.defs/.settings/org.eclipse.jdt.ui.prefs
index 1bcd6e9c80..cda5187748 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/.settings/org.eclipse.jdt.ui.prefs
@@ -1,4 +1,66 @@
-#Mon Dec 15 16:13:39 CET 2008
+#Wed Dec 31 15:41:22 CET 2008
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_serial_version_id=true
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=true
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=false
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup_profile=_EMFT
+cleanup_settings_version=2
 eclipse.preferences.version=1
-formatter_profile=_Unmanaged profile 'EMFT' mine
+formatter_profile=_EMFT
 formatter_settings_version=11
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=org.eclipse.emf.cdo;org.eclipse.emf.internal.cdo;org.eclipse.net4j;org.eclipse.internal.net4j;org.eclipse.emf;org.eclipse;com;org;javax;java;
+org.eclipse.jdt.ui.javadoc=false
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/***************************************************************************\r\n * Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n *    Eike Stepper - initial API and implementation\r\n **************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author Eike Stepper\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.defs/META-INF/MANIFEST.MF
index b41de73c5a..decbb9bfc6 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/META-INF/MANIFEST.MF
@@ -7,10 +7,9 @@ Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.ui.cdouidefs;version="2.0.0",
- org.eclipse.emf.cdo.ui.cdouidefs.editorlauncher;version="2.0.0",
- org.eclipse.emf.cdo.ui.cdouidefs.impl;version="2.0.0",
- org.eclipse.emf.cdo.ui.cdouidefs.util;version="2.0.0"
+Export-Package: org.eclipse.emf.cdo.ui.defs;version="2.0.0",
+ org.eclipse.emf.cdo.ui.defs.impl;version="2.0.0",
+ org.eclipse.emf.cdo.ui.defs.util;version="2.0.0"
 Require-Bundle: org.eclipse.emf.cdo.defs;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/model/org.eclipse.emf.cdo.ui.defs.ecore b/plugins/org.eclipse.emf.cdo.ui.defs/model/org.eclipse.emf.cdo.ui.defs.ecore
index 8c16552050..7e03f83b09 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/model/org.eclipse.emf.cdo.ui.defs.ecore
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/model/org.eclipse.emf.cdo.ui.defs.ecore
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ecore:EPackage xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="cdouidefs"
-    nsURI="http://www.eclipse.org/emf/CDO/ui/defs/1.0.0" nsPrefix="cdouidefs">
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="defs"
+    nsURI="http://www.eclipse.org/emf/CDO/ui/defs/1.0.0" nsPrefix="cdo.ui.defs">
   <eClassifiers xsi:type="ecore:EClass" name="EditorDef" eSuperTypes="../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecore#//Def">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="editorID" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/model/org.eclipse.emf.cdo.ui.defs.ecorediag b/plugins/org.eclipse.emf.cdo.ui.defs/model/org.eclipse.emf.cdo.ui.defs.ecorediag
index 21eee2e26a..7783e0f97d 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/model/org.eclipse.emf.cdo.ui.defs.ecorediag
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/model/org.eclipse.emf.cdo.ui.defs.ecorediag
@@ -1,53 +1,80 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmi:id="_IICdgchYEd2cL7seIDpZRw" type="EcoreTools" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_ILuDoMhYEd2cL7seIDpZRw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_IMxzkMhYEd2cL7seIDpZRw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_IM4hQMhYEd2cL7seIDpZRw" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_IPMOYMhYEd2cL7seIDpZRw" type="2001">
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmi:id="_OnNmMNaXEd2SlI59-vBXIw" type="EcoreTools" measurementUnit="Pixel">
+  <children xmi:type="notation:Node" xmi:id="_OnViANaXEd2SlI59-vBXIw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_OnViA9aXEd2SlI59-vBXIw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_OnWJENaXEd2SlI59-vBXIw" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_OnZMYNaXEd2SlI59-vBXIw" type="2001">
         <element xmi:type="ecore:EAttribute" href="org.eclipse.emf.cdo.ui.defs.ecore#//EditorDef/editorID"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_IPMOYchYEd2cL7seIDpZRw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_OnZMYdaXEd2SlI59-vBXIw"/>
       </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_IM4hQchYEd2cL7seIDpZRw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_IM4hQshYEd2cL7seIDpZRw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_IM4hQ8hYEd2cL7seIDpZRw"/>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_OnWJEdaXEd2SlI59-vBXIw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_OnWJEtaXEd2SlI59-vBXIw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_OnWJE9aXEd2SlI59-vBXIw"/>
     </children>
-    <children xmi:type="notation:Node" xmi:id="_IM69gMhYEd2cL7seIDpZRw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_IM69gchYEd2cL7seIDpZRw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_IM69gshYEd2cL7seIDpZRw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_IM69g8hYEd2cL7seIDpZRw"/>
+    <children xmi:type="notation:Node" xmi:id="_OnWwINaXEd2SlI59-vBXIw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_OnWwIdaXEd2SlI59-vBXIw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_OnWwItaXEd2SlI59-vBXIw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_OnWwI9aXEd2SlI59-vBXIw"/>
     </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_ILuDochYEd2cL7seIDpZRw" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_OnViAdaXEd2SlI59-vBXIw" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
     <element xmi:type="ecore:EClass" href="org.eclipse.emf.cdo.ui.defs.ecore#//EditorDef"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ILuDoshYEd2cL7seIDpZRw" x="16"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OnViAtaXEd2SlI59-vBXIw" x="64" y="176"/>
   </children>
-  <children xmi:type="notation:Node" xmi:id="_IPPRsMhYEd2cL7seIDpZRw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_IPZpwMhYEd2cL7seIDpZRw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_IPaQ0MhYEd2cL7seIDpZRw" type="5001">
-      <children xmi:type="notation:Node" xmi:id="_IPizsMhYEd2cL7seIDpZRw" type="2001">
+  <children xmi:type="notation:Node" xmi:id="_OnZMYtaXEd2SlI59-vBXIw" type="1001">
+    <children xmi:type="notation:Node" xmi:id="_OnZzcNaXEd2SlI59-vBXIw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_OnZzcdaXEd2SlI59-vBXIw" type="5001">
+      <children xmi:type="notation:Node" xmi:id="_OncPsNaXEd2SlI59-vBXIw" type="2001">
         <element xmi:type="ecore:EAttribute" href="org.eclipse.emf.cdo.ui.defs.ecore#//CDOEditorDef/resourcePath"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_IPizschYEd2cL7seIDpZRw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_OncPsdaXEd2SlI59-vBXIw"/>
       </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_IPaQ0chYEd2cL7seIDpZRw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_IPaQ0shYEd2cL7seIDpZRw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_IPaQ08hYEd2cL7seIDpZRw"/>
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_OnZzctaXEd2SlI59-vBXIw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_OnZzc9aXEd2SlI59-vBXIw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_OnZzdNaXEd2SlI59-vBXIw"/>
     </children>
-    <children xmi:type="notation:Node" xmi:id="_IPaQ1MhYEd2cL7seIDpZRw" type="5002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_IPaQ1chYEd2cL7seIDpZRw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_IPaQ1shYEd2cL7seIDpZRw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_IPaQ18hYEd2cL7seIDpZRw"/>
+    <children xmi:type="notation:Node" xmi:id="_OnZzddaXEd2SlI59-vBXIw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_OnZzdtaXEd2SlI59-vBXIw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_OnZzd9aXEd2SlI59-vBXIw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_OnZzeNaXEd2SlI59-vBXIw"/>
     </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_IPPRschYEd2cL7seIDpZRw" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_OnZMY9aXEd2SlI59-vBXIw" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
     <element xmi:type="ecore:EClass" href="org.eclipse.emf.cdo.ui.defs.ecore#//CDOEditorDef"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IPPRsshYEd2cL7seIDpZRw" y="109"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OnZMZNaXEd2SlI59-vBXIw" x="48" y="288"/>
   </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_IIDroMhYEd2cL7seIDpZRw"/>
+  <children xmi:type="notation:Node" xmi:id="_PXqywNaXEd2SlI59-vBXIw" type="1001">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PYSd0NaXEd2SlI59-vBXIw" source="Shortcut">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PYSd0daXEd2SlI59-vBXIw" key="modelID" value="EcoreTools"/>
+    </eAnnotations>
+    <children xmi:type="notation:Node" xmi:id="_PYQooNaXEd2SlI59-vBXIw" type="4001"/>
+    <children xmi:type="notation:Node" xmi:id="_PYRPsNaXEd2SlI59-vBXIw" type="5001">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_PYRPsdaXEd2SlI59-vBXIw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_PYRPstaXEd2SlI59-vBXIw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_PYRPs9aXEd2SlI59-vBXIw"/>
+    </children>
+    <children xmi:type="notation:Node" xmi:id="_PYR2wNaXEd2SlI59-vBXIw" type="5002">
+      <styles xmi:type="notation:DrawerStyle" xmi:id="_PYR2wdaXEd2SlI59-vBXIw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_PYR2wtaXEd2SlI59-vBXIw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_PYR2w9aXEd2SlI59-vBXIw"/>
+    </children>
+    <styles xmi:type="notation:ShapeStyle" xmi:id="_PXqywdaXEd2SlI59-vBXIw" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
+    <element xmi:type="ecore:EClass" href="platform:/resource/org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.ecore#//Def"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PXqywtaXEd2SlI59-vBXIw" x="32" y="32"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_OnNmMdaXEd2SlI59-vBXIw"/>
   <element xmi:type="ecore:EPackage" href="org.eclipse.emf.cdo.ui.defs.ecore#/"/>
-  <edges xmi:type="notation:Edge" xmi:id="_IPty0MhYEd2cL7seIDpZRw" type="3003" source="_IPPRsMhYEd2cL7seIDpZRw" target="_ILuDoMhYEd2cL7seIDpZRw">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_IPty0chYEd2cL7seIDpZRw" routing="Tree" lineColor="0"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_IPuZ4MhYEd2cL7seIDpZRw" fontName="Sans"/>
+  <edges xmi:type="notation:Edge" xmi:id="_OncPstaXEd2SlI59-vBXIw" type="3003" source="_OnZMYtaXEd2SlI59-vBXIw" target="_OnViANaXEd2SlI59-vBXIw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_OncPs9aXEd2SlI59-vBXIw" routing="Tree" lineColor="0"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_OncPtNaXEd2SlI59-vBXIw" fontName="Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OncPtdaXEd2SlI59-vBXIw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OqBpoNaXEd2SlI59-vBXIw" id="(0.49707603,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OqCQsNaXEd2SlI59-vBXIw" id="(0.4964029,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_PYkKoNaXEd2SlI59-vBXIw" type="3003" source="_OnViANaXEd2SlI59-vBXIw" target="_PXqywNaXEd2SlI59-vBXIw">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_PYkKodaXEd2SlI59-vBXIw" routing="Tree" lineColor="0"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_PYkKotaXEd2SlI59-vBXIw" fontName="Sans"/>
     <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IPuZ4chYEd2cL7seIDpZRw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JEdpgMhYEd2cL7seIDpZRw" id="(0.49707603,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JEeQkMhYEd2cL7seIDpZRw" id="(0.4964029,1.0)"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PYkKo9aXEd2SlI59-vBXIw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PY0pUNaXEd2SlI59-vBXIw" id="(0.4964029,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PY1QYNaXEd2SlI59-vBXIw" id="(0.49756098,1.0)"/>
   </edges>
 </notation:Diagram>
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 fcba66acf2..a10b122744 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,10 +1,17 @@
 <?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"
+<<<<<<< org.eclipse.emf.cdo.ui.defs.genmodel
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.&#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; *    André Dietisheim - initial API and implementation&#xA;"
+    modelDirectory="/org.eclipse.emf.cdo.ui.defs/src" modelPluginID="org.eclipse.emf.cdo.ui.defs"
+    modelName="Org.eclipse.emf.cdo.ui" 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">
+=======
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.cdo.ui.defs/src"
     editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.cdo.ui.defs"
     modelName="Org.eclipse.emf.cdo.ui" 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#//cdodefs ../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel#//net4jutildefs ../../org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.genmodel#//net4jdefs">
+>>>>>>> 1.2
   <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#/">
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/plugin.xml b/plugins/org.eclipse.emf.cdo.ui.defs/plugin.xml
index a01f00e66e..b2d201292c 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/plugin.xml
@@ -5,7 +5,7 @@
  <copyright>
  </copyright>
 
- $Id: plugin.xml,v 1.1 2008-12-28 18:05:25 estepper Exp $
+ $Id: plugin.xml,v 1.2 2008-12-31 14:43:07 estepper Exp $
 -->
 
 <plugin>
@@ -13,7 +13,7 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <package
             uri="http://www.eclipse.org/emf/CDO/ui/defs/1.0.0"
-            class="org.eclipse.emf.cdo.ui.cdouidefs.CDOUIDefsPackage"
+            class="org.eclipse.emf.cdo.ui.defs.CDOUIDefsPackage"
             genModel="model/org.eclipse.emf.cdo.ui.defs.genmodel"/>
    </extension>
    <extension
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/CDOEditorDef.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/CDOEditorDef.java
deleted file mode 100644
index 4546e70f00..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/CDOEditorDef.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CDOEditorDef.java,v 1.1 2008-12-28 18:05:24 estepper Exp $
- */
-package org.eclipse.emf.cdo.ui.cdouidefs;
-
-import org.eclipse.emf.cdo.cdodefs.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.cdouidefs.CDOEditorDef#getCdoView <em>Cdo View</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.ui.cdouidefs.CDOEditorDef#getResourcePath <em>Resource Path</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.emf.cdo.ui.cdouidefs.CDOUIDefsPackage#getCDOEditorDef()
- * @model
- * @generated
- */
-public interface CDOEditorDef extends EditorDef {
-	/**
-   * 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.cdouidefs.CDOUIDefsPackage#getCDOEditorDef_CdoView()
-   * @model required="true"
-   * @generated
-   */
-	CDOViewDef getCdoView();
-
-	/**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.ui.cdouidefs.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.
-   * @see #getCdoView()
-   * @generated
-   */
-	void setCdoView(CDOViewDef value);
-
-	/**
-   * 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.cdouidefs.CDOUIDefsPackage#getCDOEditorDef_ResourcePath()
-   * @model required="true"
-   * @generated
-   */
-	String getResourcePath();
-
-	/**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.ui.cdouidefs.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
-   */
-	void setResourcePath(String value);
-
-} // CDOEditorDef
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/CDOUIDefsFactory.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/CDOUIDefsFactory.java
deleted file mode 100644
index 96a10d8a05..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/CDOUIDefsFactory.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CDOUIDefsFactory.java,v 1.1 2008-12-28 18:05:24 estepper Exp $
- */
-package org.eclipse.emf.cdo.ui.cdouidefs;
-
-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.cdouidefs.CDOUIDefsPackage
- * @generated
- */
-public interface CDOUIDefsFactory extends EFactory {
-	/**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	CDOUIDefsFactory eINSTANCE = org.eclipse.emf.cdo.ui.cdouidefs.impl.CDOUIDefsFactoryImpl.init();
-
-	/**
-   * 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 -->
-   * @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 -->
-   * @return the package supported by this factory.
-   * @generated
-   */
-	CDOUIDefsPackage getCDOUIDefsPackage();
-
-} //CDOUIDefsFactory
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/CDOUIDefsPackage.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/CDOUIDefsPackage.java
deleted file mode 100644
index 02dc236986..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/CDOUIDefsPackage.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CDOUIDefsPackage.java,v 1.1 2008-12-28 18:05:24 estepper Exp $
- */
-package org.eclipse.emf.cdo.ui.cdouidefs;
-
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.emf.cdo.ui.cdouidefs.CDOUIDefsFactory
- * @model kind="package"
- * @generated
- */
-public interface CDOUIDefsPackage extends EPackage {
-	/**
-   * The package name.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	String eNAME = "cdouidefs";
-
-	/**
-   * 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 -->
-   * @generated
-   */
-	String eNS_PREFIX = "cdouidefs";
-
-	/**
-   * The singleton instance of the package.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	CDOUIDefsPackage eINSTANCE = org.eclipse.emf.cdo.ui.cdouidefs.impl.CDOUIDefsPackageImpl.init();
-
-	/**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.ui.cdouidefs.impl.EditorDefImpl <em>Editor Def</em>}' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.ui.cdouidefs.impl.EditorDefImpl
-   * @see org.eclipse.emf.cdo.ui.cdouidefs.impl.CDOUIDefsPackageImpl#getEditorDef()
-   * @generated
-   */
-	int EDITOR_DEF = 0;
-
-	/**
-   * 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 -->
-   * @generated
-   * @ordered
-   */
-	int EDITOR_DEF_FEATURE_COUNT = Net4jUtilDefsPackage.DEF_FEATURE_COUNT + 1;
-
-	/**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.ui.cdouidefs.impl.CDOEditorDefImpl <em>CDO Editor Def</em>}' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.ui.cdouidefs.impl.CDOEditorDefImpl
-   * @see org.eclipse.emf.cdo.ui.cdouidefs.impl.CDOUIDefsPackageImpl#getCDOEditorDef()
-   * @generated
-   */
-	int CDO_EDITOR_DEF = 1;
-
-	/**
-   * 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 -->
-   * @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 -->
-   * @generated
-   * @ordered
-   */
-	int CDO_EDITOR_DEF__RESOURCE_PATH = EDITOR_DEF_FEATURE_COUNT + 1;
-
-	/**
-   * The number of structural features of the '<em>CDO Editor Def</em>' class.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-	int CDO_EDITOR_DEF_FEATURE_COUNT = EDITOR_DEF_FEATURE_COUNT + 2;
-
-
-	/**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.ui.cdouidefs.EditorDef <em>Editor Def</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Editor Def</em>'.
-   * @see org.eclipse.emf.cdo.ui.cdouidefs.EditorDef
-   * @generated
-   */
-	EClass getEditorDef();
-
-	/**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.ui.cdouidefs.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.cdouidefs.EditorDef#getEditorID()
-   * @see #getEditorDef()
-   * @generated
-   */
-	EAttribute getEditorDef_EditorID();
-
-	/**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.ui.cdouidefs.CDOEditorDef <em>CDO Editor Def</em>}'.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the meta object for class '<em>CDO Editor Def</em>'.
-   * @see org.eclipse.emf.cdo.ui.cdouidefs.CDOEditorDef
-   * @generated
-   */
-	EClass getCDOEditorDef();
-
-	/**
-   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.ui.cdouidefs.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.cdouidefs.CDOEditorDef#getCdoView()
-   * @see #getCDOEditorDef()
-   * @generated
-   */
-	EReference getCDOEditorDef_CdoView();
-
-	/**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.ui.cdouidefs.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.cdouidefs.CDOEditorDef#getResourcePath()
-   * @see #getCDOEditorDef()
-   * @generated
-   */
-	EAttribute getCDOEditorDef_ResourcePath();
-
-	/**
-   * 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
-   */
-	CDOUIDefsFactory getCDOUIDefsFactory();
-
-	/**
-   * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <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.cdouidefs.impl.EditorDefImpl <em>Editor Def</em>}' class.
-     * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-     * @see org.eclipse.emf.cdo.ui.cdouidefs.impl.EditorDefImpl
-     * @see org.eclipse.emf.cdo.ui.cdouidefs.impl.CDOUIDefsPackageImpl#getEditorDef()
-     * @generated
-     */
-		EClass EDITOR_DEF = eINSTANCE.getEditorDef();
-
-		/**
-     * 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.cdouidefs.impl.CDOEditorDefImpl <em>CDO Editor Def</em>}' class.
-     * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-     * @see org.eclipse.emf.cdo.ui.cdouidefs.impl.CDOEditorDefImpl
-     * @see org.eclipse.emf.cdo.ui.cdouidefs.impl.CDOUIDefsPackageImpl#getCDOEditorDef()
-     * @generated
-     */
-		EClass CDO_EDITOR_DEF = eINSTANCE.getCDOEditorDef();
-
-		/**
-     * 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 -->
-		 * <!-- end-user-doc -->
-     * @generated
-     */
-		EAttribute CDO_EDITOR_DEF__RESOURCE_PATH = eINSTANCE.getCDOEditorDef_ResourcePath();
-
-	}
-
-} //CDOUIDefsPackage
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/EditorDef.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/EditorDef.java
deleted file mode 100644
index b1d40b849f..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/EditorDef.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: EditorDef.java,v 1.1 2008-12-28 18:05:24 estepper Exp $
- */
-package org.eclipse.emf.cdo.ui.cdouidefs;
-
-import org.eclipse.net4j.util.net4jutildefs.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.cdouidefs.EditorDef#getEditorID <em>Editor ID</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.emf.cdo.ui.cdouidefs.CDOUIDefsPackage#getEditorDef()
- * @model
- * @generated
- */
-public interface EditorDef extends Def {
-	/**
-   * 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.cdouidefs.CDOUIDefsPackage#getEditorDef_EditorID()
-   * @model required="true"
-   * @generated
-   */
-	String getEditorID();
-
-	/**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.ui.cdouidefs.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.
-   * @see #getEditorID()
-   * @generated
-   */
-	void setEditorID(String value);
-
-} // EditorDef
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/editorlauncher/EditorLauncher.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/editorlauncher/EditorLauncher.java
deleted file mode 100644
index b6bfdcab95..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/editorlauncher/EditorLauncher.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2008 Open Canarias S.L. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *    Victor Roldan Betancort - initial API and implementation
- *    Eike Stepper - maintenance
- **************************************************************************/
-
-package org.eclipse.emf.cdo.ui.cdouidefs.editorlauncher;
-
-import org.eclipse.emf.cdo.ui.cdouidefs.EditorDef;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.ui.IEditorLauncher;
-
-@SuppressWarnings("restriction")
-public class EditorLauncher implements IEditorLauncher
-{
-
-  public void open(IPath file)
-  {
-    ResourceSet resourceSet = new ResourceSetImpl();
-    URI resourceURI = URI.createFileURI(file.toString());
-    Resource ecoreResource = resourceSet.getResource(resourceURI, true);
-    EObject eObject = ecoreResource.getContents().get(0);
-    if (eObject instanceof EditorDef)
-    {
-      EditorDef editorDef = ((EditorDef) eObject);
-      editorDef.getInstance();
-    }
-  }
-}
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/impl/CDOUIDefsFactoryImpl.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/impl/CDOUIDefsFactoryImpl.java
deleted file mode 100644
index cc1c1a8030..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/impl/CDOUIDefsFactoryImpl.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CDOUIDefsFactoryImpl.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
- */
-package org.eclipse.emf.cdo.ui.cdouidefs.impl;
-
-import org.eclipse.emf.cdo.ui.cdouidefs.CDOEditorDef;
-import org.eclipse.emf.cdo.ui.cdouidefs.CDOUIDefsFactory;
-import org.eclipse.emf.cdo.ui.cdouidefs.CDOUIDefsPackage;
-import org.eclipse.emf.cdo.ui.cdouidefs.EditorDef;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-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 -->
-   * @generated
-   */
-	public static CDOUIDefsFactory init() {
-    try
-    {
-      CDOUIDefsFactory theCDOUIDefsFactory = (CDOUIDefsFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/CDO/ui/defs/1.0.0"); 
-      if (theCDOUIDefsFactory != null)
-      {
-        return theCDOUIDefsFactory;
-      }
-    }
-    catch (Exception exception)
-    {
-      EcorePlugin.INSTANCE.log(exception);
-    }
-    return new CDOUIDefsFactoryImpl();
-  }
-
-	/**
-   * Creates an instance of the factory.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public CDOUIDefsFactoryImpl() {
-    super();
-  }
-
-	/**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	@Override
-	public EObject create(EClass eClass) {
-    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");
-    }
-  }
-
-	/**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EditorDef createEditorDef() {
-    EditorDefImpl editorDef = new EditorDefImpl();
-    return editorDef;
-  }
-
-	/**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public CDOEditorDef createCDOEditorDef() {
-    CDOEditorDefImpl cdoEditorDef = new CDOEditorDefImpl();
-    return cdoEditorDef;
-  }
-
-	/**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public CDOUIDefsPackage getCDOUIDefsPackage() {
-    return (CDOUIDefsPackage)getEPackage();
-  }
-
-	/**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @deprecated
-   * @generated
-   */
-	@Deprecated
-	public static CDOUIDefsPackage getPackage() {
-    return CDOUIDefsPackage.eINSTANCE;
-  }
-
-} //CDOUIDefsFactoryImpl
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/impl/CDOUIDefsPackageImpl.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/impl/CDOUIDefsPackageImpl.java
deleted file mode 100644
index d1dd5951fc..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/impl/CDOUIDefsPackageImpl.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CDOUIDefsPackageImpl.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
- */
-package org.eclipse.emf.cdo.ui.cdouidefs.impl;
-
-import org.eclipse.emf.cdo.cdodefs.CDODefsPackage;
-import org.eclipse.emf.cdo.ui.cdouidefs.CDOEditorDef;
-import org.eclipse.emf.cdo.ui.cdouidefs.CDOUIDefsFactory;
-import org.eclipse.emf.cdo.ui.cdouidefs.CDOUIDefsPackage;
-import org.eclipse.emf.cdo.ui.cdouidefs.EditorDef;
-
-import org.eclipse.net4j.util.net4jutildefs.Net4jUtilDefsPackage;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-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;
-
-	/**
-   * Creates an instance of the model <b>Package</b>, registered with
-   * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-   * package URI value.
-   * <p>Note: the correct way to create the package is via the static
-   * factory method {@link #init init()}, which also performs
-   * initialization of the package, or returns the registered package,
-   * if one already exists.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @see org.eclipse.emf.ecore.EPackage.Registry
-   * @see org.eclipse.emf.cdo.ui.cdouidefs.CDOUIDefsPackage#eNS_URI
-   * @see #init()
-   * @generated
-   */
-	private CDOUIDefsPackageImpl() {
-    super(eNS_URI, CDOUIDefsFactory.eINSTANCE);
-  }
-
-	/**
-   * <!-- 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 -->
-   * @see #eNS_URI
-   * @see #createPackageContents()
-   * @see #initializePackageContents()
-   * @generated
-   */
-	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.getEPackage(eNS_URI) instanceof CDOUIDefsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new CDOUIDefsPackageImpl());
-
-    isInited = true;
-
-    // Initialize simple dependencies
-    CDODefsPackage.eINSTANCE.eClass();
-
-    // Create package meta-data objects
-    theCDOUIDefsPackage.createPackageContents();
-
-    // Initialize created meta-data
-    theCDOUIDefsPackage.initializePackageContents();
-
-    // Mark meta-data to indicate it can't be changed
-    theCDOUIDefsPackage.freeze();
-
-    return theCDOUIDefsPackage;
-  }
-
-	/**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EClass getEditorDef() {
-    return editorDefEClass;
-  }
-
-	/**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getEditorDef_EditorID() {
-    return (EAttribute)editorDefEClass.getEStructuralFeatures().get(0);
-  }
-
-	/**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EClass getCDOEditorDef() {
-    return cdoEditorDefEClass;
-  }
-
-	/**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EReference getCDOEditorDef_CdoView() {
-    return (EReference)cdoEditorDefEClass.getEStructuralFeatures().get(0);
-  }
-
-	/**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public EAttribute getCDOEditorDef_ResourcePath() {
-    return (EAttribute)cdoEditorDefEClass.getEStructuralFeatures().get(1);
-  }
-
-	/**
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @generated
-   */
-	public CDOUIDefsFactory getCDOUIDefsFactory() {
-    return (CDOUIDefsFactory)getEFactoryInstance();
-  }
-
-	/**
-   * <!-- 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 -->
-   * @generated
-   */
-	public void createPackageContents() {
-    if (isCreated) return;
-    isCreated = true;
-
-    // Create classes and their features
-    editorDefEClass = createEClass(EDITOR_DEF);
-    createEAttribute(editorDefEClass, EDITOR_DEF__EDITOR_ID);
-
-    cdoEditorDefEClass = createEClass(CDO_EDITOR_DEF);
-    createEReference(cdoEditorDefEClass, CDO_EDITOR_DEF__CDO_VIEW);
-    createEAttribute(cdoEditorDefEClass, CDO_EDITOR_DEF__RESOURCE_PATH);
-  }
-
-	/**
-   * <!-- 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 -->
-   * @generated
-   */
-	public void initializePackageContents() {
-    if (isInitialized) return;
-    isInitialized = true;
-
-    // Initialize package
-    setName(eNAME);
-    setNsPrefix(eNS_PREFIX);
-    setNsURI(eNS_URI);
-
-    // Obtain other dependent packages
-    Net4jUtilDefsPackage theNet4jUtilDefsPackage = (Net4jUtilDefsPackage)EPackage.Registry.INSTANCE.getEPackage(Net4jUtilDefsPackage.eNS_URI);
-    CDODefsPackage theCDODefsPackage = (CDODefsPackage)EPackage.Registry.INSTANCE.getEPackage(CDODefsPackage.eNS_URI);
-
-    // Create type parameters
-
-    // Set bounds for type parameters
-
-    // Add supertypes to classes
-    editorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    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);
-    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);
-  }
-
-} //CDOUIDefsPackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/impl/EditorDefImpl.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/impl/EditorDefImpl.java
deleted file mode 100644
index 49800b28a3..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/impl/EditorDefImpl.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: EditorDefImpl.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
- */
-package org.eclipse.emf.cdo.ui.cdouidefs.impl;
-
-import org.eclipse.emf.cdo.ui.cdouidefs.CDOUIDefsPackage;
-import org.eclipse.emf.cdo.ui.cdouidefs.EditorDef;
-
-import org.eclipse.net4j.util.CheckUtil;
-import org.eclipse.net4j.util.net4jutildefs.impl.DefImpl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Editor Def</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.emf.cdo.ui.cdouidefs.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 --> <!-- end-user-doc -->
-   * @see #getEditorID()
-   * @generated
-   * @ordered
-   */
-	protected static final String EDITOR_ID_EDEFAULT = null;
-	/**
-   * The cached value of the '{@link #getEditorID() <em>Editor ID</em>}' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @see #getEditorID()
-   * @generated
-   * @ordered
-   */
-	protected String editorID = EDITOR_ID_EDEFAULT;
-
-	/**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-	protected EditorDefImpl() {
-    super();
-  }
-
-	/**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-	@Override
-	protected EClass eStaticClass() {
-    return CDOUIDefsPackage.Literals.EDITOR_DEF;
-  }
-
-	/**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-	public String getEditorID() {
-    return editorID;
-  }
-
-	/**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-	public void setEditorID(String newEditorID) {
-    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
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-    switch (featureID)
-    {
-      case CDOUIDefsPackage.EDITOR_DEF__EDITOR_ID:
-        return getEditorID();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-	/**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-    switch (featureID)
-    {
-      case CDOUIDefsPackage.EDITOR_DEF__EDITOR_ID:
-        setEditorID((String)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-	/**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-	@Override
-	public void eUnset(int featureID) {
-    switch (featureID)
-    {
-      case CDOUIDefsPackage.EDITOR_DEF__EDITOR_ID:
-        setEditorID(EDITOR_ID_EDEFAULT);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-	/**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @generated
-   */
-	@Override
-	public boolean eIsSet(int featureID) {
-    switch (featureID)
-    {
-      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();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (editorID: ");
-    result.append(editorID);
-    result.append(')');
-    return result.toString();
-  }
-
-	@Override
-	protected Object createInstance() {
-		throw new UnsupportedOperationException("not implemented yet!");
-	}
-
-	@Override
-	protected void validateDefinition() {
-		CheckUtil.checkState(getEditorID() != null
-				&& getEditorID().length() >= 0, "editor id not set!");
-	}
-} // EditorDefImpl
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/util/CDOUIDefsAdapterFactory.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/util/CDOUIDefsAdapterFactory.java
deleted file mode 100644
index 3453471126..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/util/CDOUIDefsAdapterFactory.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CDOUIDefsAdapterFactory.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
- */
-package org.eclipse.emf.cdo.ui.cdouidefs.util;
-
-import org.eclipse.emf.cdo.ui.cdouidefs.CDOEditorDef;
-import org.eclipse.emf.cdo.ui.cdouidefs.CDOUIDefsPackage;
-import org.eclipse.emf.cdo.ui.cdouidefs.EditorDef;
-
-import org.eclipse.net4j.util.net4jutildefs.Def;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-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.cdouidefs.CDOUIDefsPackage
- * @generated
- */
-public class CDOUIDefsAdapterFactory extends AdapterFactoryImpl {
-	/**
-   * 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 -->
-   * @generated
-   */
-	public CDOUIDefsAdapterFactory() {
-    if (modelPackage == null)
-    {
-      modelPackage = CDOUIDefsPackage.eINSTANCE;
-    }
-  }
-
-	/**
-   * 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
-   */
-	@Override
-	public boolean isFactoryForType(Object object) {
-    if (object == modelPackage)
-    {
-      return true;
-    }
-    if (object instanceof EObject)
-    {
-      return ((EObject)object).eClass().getEPackage() == modelPackage;
-    }
-    return false;
-  }
-
-	/**
-   * 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();
-      }
-    };
-
-	/**
-   * 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
-   */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-    return modelSwitch.doSwitch((EObject)target);
-  }
-
-
-	/**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.ui.cdouidefs.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.cdouidefs.EditorDef
-   * @generated
-   */
-	public Adapter createEditorDefAdapter() {
-    return null;
-  }
-
-	/**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.ui.cdouidefs.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.cdouidefs.CDOEditorDef
-   * @generated
-   */
-	public Adapter createCDOEditorDefAdapter() {
-    return null;
-  }
-
-	/**
-   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.net4jutildefs.Def <em>Def</em>}'.
-   * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.net4j.util.net4jutildefs.Def
-   * @generated
-   */
-	public Adapter createDefAdapter() {
-    return 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
-   */
-	public Adapter createEObjectAdapter() {
-    return null;
-  }
-
-} //CDOUIDefsAdapterFactory
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/util/CDOUIDefsSwitch.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/util/CDOUIDefsSwitch.java
deleted file mode 100644
index c1ea700dd6..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/util/CDOUIDefsSwitch.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CDOUIDefsSwitch.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
- */
-package org.eclipse.emf.cdo.ui.cdouidefs.util;
-
-import org.eclipse.emf.cdo.ui.cdouidefs.CDOEditorDef;
-import org.eclipse.emf.cdo.ui.cdouidefs.CDOUIDefsPackage;
-import org.eclipse.emf.cdo.ui.cdouidefs.EditorDef;
-
-import org.eclipse.net4j.util.net4jutildefs.Def;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@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.cdouidefs.CDOUIDefsPackage
- * @generated
- */
-public class CDOUIDefsSwitch<T> {
-	/**
-   * 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 -->
-   * @generated
-   */
-	public CDOUIDefsSwitch() {
-    if (modelPackage == null)
-    {
-      modelPackage = CDOUIDefsPackage.eINSTANCE;
-    }
-  }
-
-	/**
-   * 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
-   */
-	public T doSwitch(EObject theEObject) {
-    return doSwitch(theEObject.eClass(), theEObject);
-  }
-
-	/**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-	protected T doSwitch(EClass theEClass, EObject theEObject) {
-    if (theEClass.eContainer() == modelPackage)
-    {
-      return doSwitch(theEClass.getClassifierID(), theEObject);
-    }
-    else
-    {
-      List<EClass> eSuperTypes = theEClass.getESuperTypes();
-      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
-   */
-	protected T doSwitch(int classifierID, EObject theEObject) {
-    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);
-    }
-  }
-
-	/**
-   * 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.
-   * @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
-   */
-	public T caseEditorDef(EditorDef object) {
-    return null;
-  }
-
-	/**
-   * 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.
-   * @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
-   */
-	public T caseCDOEditorDef(CDOEditorDef object) {
-    return null;
-  }
-
-	/**
-   * Returns the result of interpreting the object as an instance of '<em>Def</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Def</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-	public T caseDef(Def object) {
-    return null;
-  }
-
-	/**
-   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-   * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-   * @generated
-   */
-	public T defaultCase(EObject object) {
-    return null;
-  }
-
-} //CDOUIDefsSwitch
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
new file mode 100644
index 0000000000..a11108d4e5
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOEditorDef.java
@@ -0,0 +1,89 @@
+/**
+ * <copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    André Dietisheim - initial API and implementation
+ * </copyright>
+ *
+ * $Id: CDOEditorDef.java,v 1.1 2008-12-31 14:43:07 estepper Exp $
+ */
+package org.eclipse.emf.cdo.ui.defs;
+
+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>
+ * </ul>
+ * </p>
+ * 
+ * @see org.eclipse.emf.cdo.ui.defs.CDOUIDefsPackage#getCDOEditorDef()
+ * @model
+ * @generated
+ */
+public interface CDOEditorDef extends EditorDef
+{
+  /**
+   * 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()
+   * @model required="true"
+   * @generated
+   */
+  CDOViewDef getCdoView();
+
+  /**
+   * 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.
+   * @see #getCdoView()
+   * @generated
+   */
+  void setCdoView(CDOViewDef value);
+
+  /**
+   * 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()
+   * @model required="true"
+   * @generated
+   */
+  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.
+   * @see #getResourcePath()
+   * @generated
+   */
+  void setResourcePath(String value);
+
+} // CDOEditorDef
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
new file mode 100644
index 0000000000..33b85abb1d
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOUIDefsFactory.java
@@ -0,0 +1,59 @@
+/**
+ * <copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    André Dietisheim - initial API and implementation
+ * </copyright>
+ *
+ * $Id: CDOUIDefsFactory.java,v 1.1 2008-12-31 14:43:07 estepper Exp $
+ */
+package org.eclipse.emf.cdo.ui.defs;
+
+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 -->
+   * 
+   * @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 -->
+   * 
+   * @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 -->
+   * 
+   * @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 -->
+   * 
+   * @return the package supported by this factory.
+   * @generated
+   */
+  CDOUIDefsPackage getCDOUIDefsPackage();
+
+} // CDOUIDefsFactory
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
new file mode 100644
index 0000000000..836475c1dc
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/CDOUIDefsPackage.java
@@ -0,0 +1,258 @@
+/**
+ * <copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    André Dietisheim - initial API and implementation
+ * </copyright>
+ *
+ * $Id: CDOUIDefsPackage.java,v 1.1 2008-12-31 14:43:07 estepper Exp $
+ */
+package org.eclipse.emf.cdo.ui.defs;
+
+import org.eclipse.net4j.util.defs.Net4jUtilDefsPackage;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * 
+ * @see org.eclipse.emf.cdo.ui.defs.CDOUIDefsFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface CDOUIDefsPackage extends EPackage
+{
+  /**
+   * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  String eNAME = "defs";
+
+  /**
+   * 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 -->
+   * 
+   * @generated
+   */
+  String eNS_PREFIX = "cdo.ui.defs";
+
+  /**
+   * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  CDOUIDefsPackage eINSTANCE = org.eclipse.emf.cdo.ui.defs.impl.CDOUIDefsPackageImpl.init();
+
+  /**
+   * The meta object id 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
+   */
+  int EDITOR_DEF = 0;
+
+  /**
+   * 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 -->
+   * 
+   * @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 -->
+   * 
+   * @see org.eclipse.emf.cdo.ui.defs.impl.CDOEditorDefImpl
+   * @see org.eclipse.emf.cdo.ui.defs.impl.CDOUIDefsPackageImpl#getCDOEditorDef()
+   * @generated
+   */
+  int CDO_EDITOR_DEF = 1;
+
+  /**
+   * 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 -->
+   * 
+   * @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 -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int CDO_EDITOR_DEF__RESOURCE_PATH = EDITOR_DEF_FEATURE_COUNT + 1;
+
+  /**
+   * The number of structural features of the '<em>CDO Editor Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+   * -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int CDO_EDITOR_DEF_FEATURE_COUNT = EDITOR_DEF_FEATURE_COUNT + 2;
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.ui.defs.EditorDef <em>Editor Def</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Editor Def</em>'.
+   * @see org.eclipse.emf.cdo.ui.defs.EditorDef
+   * @generated
+   */
+  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 -->
+   * 
+   * @return the meta object for the attribute '<em>Editor ID</em>'.
+   * @see org.eclipse.emf.cdo.ui.defs.EditorDef#getEditorID()
+   * @see #getEditorDef()
+   * @generated
+   */
+  EAttribute getEditorDef_EditorID();
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.ui.defs.CDOEditorDef <em>CDO Editor Def</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>CDO Editor Def</em>'.
+   * @see org.eclipse.emf.cdo.ui.defs.CDOEditorDef
+   * @generated
+   */
+  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 -->
+   * 
+   * @return the meta object for the reference '<em>Cdo View</em>'.
+   * @see org.eclipse.emf.cdo.ui.defs.CDOEditorDef#getCdoView()
+   * @see #getCDOEditorDef()
+   * @generated
+   */
+  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 -->
+   * 
+   * @return the meta object for the attribute '<em>Resource Path</em>'.
+   * @see org.eclipse.emf.cdo.ui.defs.CDOEditorDef#getResourcePath()
+   * @see #getCDOEditorDef()
+   * @generated
+   */
+  EAttribute getCDOEditorDef_ResourcePath();
+
+  /**
+   * 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
+   */
+  CDOUIDefsFactory getCDOUIDefsFactory();
+
+  /**
+   * <!-- begin-user-doc --> Defines literals for the meta objects that represent
+   * <ul>
+   * <li>each class,</li>
+   * <li>each feature of each class,</li>
+   * <li>each enum,</li>
+   * <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 -->
+     * 
+     * @see org.eclipse.emf.cdo.ui.defs.impl.EditorDefImpl
+     * @see org.eclipse.emf.cdo.ui.defs.impl.CDOUIDefsPackageImpl#getEditorDef()
+     * @generated
+     */
+    EClass EDITOR_DEF = eINSTANCE.getEditorDef();
+
+    /**
+     * 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 -->
+     * 
+     * @see org.eclipse.emf.cdo.ui.defs.impl.CDOEditorDefImpl
+     * @see org.eclipse.emf.cdo.ui.defs.impl.CDOUIDefsPackageImpl#getCDOEditorDef()
+     * @generated
+     */
+    EClass CDO_EDITOR_DEF = eINSTANCE.getCDOEditorDef();
+
+    /**
+     * 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 --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EAttribute CDO_EDITOR_DEF__RESOURCE_PATH = eINSTANCE.getCDOEditorDef_ResourcePath();
+
+  }
+
+} // CDOUIDefsPackage
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
new file mode 100644
index 0000000000..54960a0c46
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/EditorDef.java
@@ -0,0 +1,61 @@
+/**
+ * <copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    André Dietisheim - initial API and implementation
+ * </copyright>
+ *
+ * $Id: EditorDef.java,v 1.1 2008-12-31 14:43:07 estepper Exp $
+ */
+package org.eclipse.emf.cdo.ui.defs;
+
+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>
+ * </ul>
+ * </p>
+ * 
+ * @see org.eclipse.emf.cdo.ui.defs.CDOUIDefsPackage#getEditorDef()
+ * @model
+ * @generated
+ */
+public interface EditorDef extends Def
+{
+  /**
+   * 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()
+   * @model required="true"
+   * @generated
+   */
+  String getEditorID();
+
+  /**
+   * 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.
+   * @see #getEditorID()
+   * @generated
+   */
+  void setEditorID(String value);
+
+} // EditorDef
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/impl/CDOEditorDefImpl.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOEditorDefImpl.java
index d2b0722f49..a94c0b4b52 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/cdouidefs/impl/CDOEditorDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOEditorDefImpl.java
@@ -1,20 +1,28 @@
 /**
  * <copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    André Dietisheim - initial API and implementation
  * </copyright>
  *
- * $Id: CDOEditorDefImpl.java,v 1.1 2008-12-28 18:05:25 estepper Exp $
+ * $Id: CDOEditorDefImpl.java,v 1.1 2008-12-31 14:43:07 estepper Exp $
  */
-package org.eclipse.emf.cdo.ui.cdouidefs.impl;
+package org.eclipse.emf.cdo.ui.defs.impl;
 
 import org.eclipse.emf.cdo.CDOView;
-import org.eclipse.emf.cdo.cdodefs.CDOViewDef;
+import org.eclipse.emf.cdo.defs.CDOViewDef;
 import org.eclipse.emf.cdo.internal.ui.editor.CDOEditor;
 import org.eclipse.emf.cdo.internal.ui.editor.CDOEditorInput;
-import org.eclipse.emf.cdo.ui.cdouidefs.CDOEditorDef;
-import org.eclipse.emf.cdo.ui.cdouidefs.CDOUIDefsPackage;
+import org.eclipse.emf.cdo.ui.defs.CDOEditorDef;
+import org.eclipse.emf.cdo.ui.defs.CDOUIDefsPackage;
 
 import org.eclipse.net4j.util.CheckUtil;
-import org.eclipse.net4j.util.net4jutildefs.DefException;
+import org.eclipse.net4j.util.defs.DefException;
 import org.eclipse.net4j.util.ui.UIUtil;
 
 import org.eclipse.emf.common.notify.Notification;
@@ -37,9 +45,9 @@ import org.eclipse.ui.PlatformUI;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.ui.cdouidefs.impl.CDOEditorDefImpl#getCdoView <em>Cdo View</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.ui.defs.impl.CDOEditorDefImpl#getCdoView <em>Cdo View</em>}</li>
  * <li>
- * {@link org.eclipse.emf.cdo.ui.cdouidefs.impl.CDOEditorDefImpl#getResourcePath <em>Resource Path</em>}</li>
+ * {@link org.eclipse.emf.cdo.ui.defs.impl.CDOEditorDefImpl#getResourcePath <em>Resource Path</em>}</li>
  * </ul>
  * </p>
  * 
@@ -49,9 +57,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
@@ -59,9 +67,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
@@ -69,9 +77,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
@@ -147,6 +155,7 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected CDOEditorDefImpl()
@@ -156,6 +165,7 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -166,6 +176,7 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public CDOViewDef getCdoView()
@@ -177,7 +188,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));
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDOUIDefsPackage.CDO_EDITOR_DEF__CDO_VIEW,
+              oldCdoView, cdoView));
       }
     }
     return cdoView;
@@ -185,6 +197,7 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public CDOViewDef basicGetCdoView()
@@ -194,6 +207,7 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setCdoView(CDOViewDef newCdoView)
@@ -201,11 +215,13 @@ 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()
@@ -215,6 +231,7 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setResourcePath(String newResourcePath)
@@ -222,11 +239,13 @@ 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
@@ -234,37 +253,39 @@ 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
    */
-  @SuppressWarnings("unchecked")
   @Override
   public void eSet(int featureID, Object newValue)
   {
     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
@@ -272,18 +293,19 @@ 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
@@ -291,22 +313,24 @@ 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: ");
@@ -333,7 +357,6 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
   private IEditorPart openCDOEditor(String resourcePath)
   {
     IEditorInput input = new CDOEditorInput((CDOView)getCdoView().getInstance(), resourcePath);
-    IEditorPart cdoEditor = null;
     IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
     CheckUtil.checkState(workbenchWindow != null && workbenchWindow.getActivePage() != null,
         "no active window or no active page present!");
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
new file mode 100644
index 0000000000..795301619f
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOUIDefsFactoryImpl.java
@@ -0,0 +1,131 @@
+/**
+ * <copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    André Dietisheim - initial API and implementation
+ * </copyright>
+ *
+ * $Id: CDOUIDefsFactoryImpl.java,v 1.1 2008-12-31 14:43:07 estepper Exp $
+ */
+package org.eclipse.emf.cdo.ui.defs.impl;
+
+import org.eclipse.emf.cdo.ui.defs.CDOEditorDef;
+import org.eclipse.emf.cdo.ui.defs.CDOUIDefsFactory;
+import org.eclipse.emf.cdo.ui.defs.CDOUIDefsPackage;
+import org.eclipse.emf.cdo.ui.defs.EditorDef;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+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 -->
+   * 
+   * @generated
+   */
+  public static CDOUIDefsFactory init()
+  {
+    try
+    {
+      CDOUIDefsFactory theCDOUIDefsFactory = (CDOUIDefsFactory)EPackage.Registry.INSTANCE
+          .getEFactory("http://www.eclipse.org/emf/CDO/ui/defs/1.0.0");
+      if (theCDOUIDefsFactory != null)
+      {
+        return theCDOUIDefsFactory;
+      }
+    }
+    catch (Exception exception)
+    {
+      EcorePlugin.INSTANCE.log(exception);
+    }
+    return new CDOUIDefsFactoryImpl();
+  }
+
+  /**
+   * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public CDOUIDefsFactoryImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public EObject create(EClass eClass)
+  {
+    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");
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EditorDef createEditorDef()
+  {
+    EditorDefImpl editorDef = new EditorDefImpl();
+    return editorDef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public CDOEditorDef createCDOEditorDef()
+  {
+    CDOEditorDefImpl cdoEditorDef = new CDOEditorDefImpl();
+    return cdoEditorDef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public CDOUIDefsPackage getCDOUIDefsPackage()
+  {
+    return (CDOUIDefsPackage)getEPackage();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @deprecated
+   * @generated
+   */
+  @Deprecated
+  public static CDOUIDefsPackage getPackage()
+  {
+    return CDOUIDefsPackage.eINSTANCE;
+  }
+
+} // CDOUIDefsFactoryImpl
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
new file mode 100644
index 0000000000..1a77531ba5
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOUIDefsPackageImpl.java
@@ -0,0 +1,265 @@
+/**
+ * <copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    André Dietisheim - initial API and implementation
+ * </copyright>
+ *
+ * $Id: CDOUIDefsPackageImpl.java,v 1.1 2008-12-31 14:43:07 estepper Exp $
+ */
+package org.eclipse.emf.cdo.ui.defs.impl;
+
+import org.eclipse.emf.cdo.defs.CDODefsPackage;
+import org.eclipse.emf.cdo.ui.defs.CDOEditorDef;
+import org.eclipse.emf.cdo.ui.defs.CDOUIDefsFactory;
+import org.eclipse.emf.cdo.ui.defs.CDOUIDefsPackage;
+import org.eclipse.emf.cdo.ui.defs.EditorDef;
+
+import org.eclipse.net4j.util.defs.Net4jUtilDefsPackage;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+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;
+
+  /**
+   * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry
+   * EPackage.Registry} by the package package URI value.
+   * <p>
+   * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
+   * performs initialization of the package, or returns the registered package, if one already exists. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.ecore.EPackage.Registry
+   * @see org.eclipse.emf.cdo.ui.defs.CDOUIDefsPackage#eNS_URI
+   * @see #init()
+   * @generated
+   */
+  private CDOUIDefsPackageImpl()
+  {
+    super(eNS_URI, CDOUIDefsFactory.eINSTANCE);
+  }
+
+  /**
+   * <!-- 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 -->
+   * 
+   * @see #eNS_URI
+   * @see #createPackageContents()
+   * @see #initializePackageContents()
+   * @generated
+   */
+  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.getEPackage(eNS_URI) instanceof CDOUIDefsPackageImpl ? EPackage.Registry.INSTANCE
+        .getEPackage(eNS_URI)
+        : new CDOUIDefsPackageImpl());
+
+    isInited = true;
+
+    // Initialize simple dependencies
+    CDODefsPackage.eINSTANCE.eClass();
+
+    // Create package meta-data objects
+    theCDOUIDefsPackage.createPackageContents();
+
+    // Initialize created meta-data
+    theCDOUIDefsPackage.initializePackageContents();
+
+    // Mark meta-data to indicate it can't be changed
+    theCDOUIDefsPackage.freeze();
+
+    return theCDOUIDefsPackage;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getEditorDef()
+  {
+    return editorDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getEditorDef_EditorID()
+  {
+    return (EAttribute)editorDefEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EClass getCDOEditorDef()
+  {
+    return cdoEditorDefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getCDOEditorDef_CdoView()
+  {
+    return (EReference)cdoEditorDefEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EAttribute getCDOEditorDef_ResourcePath()
+  {
+    return (EAttribute)cdoEditorDefEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public CDOUIDefsFactory getCDOUIDefsFactory()
+  {
+    return (CDOUIDefsFactory)getEFactoryInstance();
+  }
+
+  /**
+   * <!-- 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 -->
+   * 
+   * @generated
+   */
+  public void createPackageContents()
+  {
+    if (isCreated)
+      return;
+    isCreated = true;
+
+    // Create classes and their features
+    editorDefEClass = createEClass(EDITOR_DEF);
+    createEAttribute(editorDefEClass, EDITOR_DEF__EDITOR_ID);
+
+    cdoEditorDefEClass = createEClass(CDO_EDITOR_DEF);
+    createEReference(cdoEditorDefEClass, CDO_EDITOR_DEF__CDO_VIEW);
+    createEAttribute(cdoEditorDefEClass, CDO_EDITOR_DEF__RESOURCE_PATH);
+  }
+
+  /**
+   * <!-- 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 -->
+   * 
+   * @generated
+   */
+  public void initializePackageContents()
+  {
+    if (isInitialized)
+      return;
+    isInitialized = true;
+
+    // Initialize package
+    setName(eNAME);
+    setNsPrefix(eNS_PREFIX);
+    setNsURI(eNS_URI);
+
+    // Obtain other dependent packages
+    Net4jUtilDefsPackage theNet4jUtilDefsPackage = (Net4jUtilDefsPackage)EPackage.Registry.INSTANCE
+        .getEPackage(Net4jUtilDefsPackage.eNS_URI);
+    CDODefsPackage theCDODefsPackage = (CDODefsPackage)EPackage.Registry.INSTANCE.getEPackage(CDODefsPackage.eNS_URI);
+
+    // Create type parameters
+
+    // Set bounds for type parameters
+
+    // Add supertypes to classes
+    editorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
+    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);
+    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);
+  }
+
+} // CDOUIDefsPackageImpl
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
new file mode 100644
index 0000000000..9869fce5d2
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/EditorDefImpl.java
@@ -0,0 +1,200 @@
+/**
+ * <copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    André Dietisheim - initial API and implementation
+ * </copyright>
+ *
+ * $Id: EditorDefImpl.java,v 1.1 2008-12-31 14:43:07 estepper Exp $
+ */
+package org.eclipse.emf.cdo.ui.defs.impl;
+
+import org.eclipse.emf.cdo.ui.defs.CDOUIDefsPackage;
+import org.eclipse.emf.cdo.ui.defs.EditorDef;
+
+import org.eclipse.net4j.util.CheckUtil;
+import org.eclipse.net4j.util.defs.impl.DefImpl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Editor Def</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <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 --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getEditorID()
+   * @generated
+   * @ordered
+   */
+  protected static final String EDITOR_ID_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getEditorID() <em>Editor ID</em>}' attribute. <!-- begin-user-doc --> <!--
+   * end-user-doc -->
+   * 
+   * @see #getEditorID()
+   * @generated
+   * @ordered
+   */
+  protected String editorID = EDITOR_ID_EDEFAULT;
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected EditorDefImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return CDOUIDefsPackage.Literals.EDITOR_DEF;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public String getEditorID()
+  {
+    return editorID;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setEditorID(String newEditorID)
+  {
+    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
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case CDOUIDefsPackage.EDITOR_DEF__EDITOR_ID:
+      return getEditorID();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case CDOUIDefsPackage.EDITOR_DEF__EDITOR_ID:
+      setEditorID((String)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case CDOUIDefsPackage.EDITOR_DEF__EDITOR_ID:
+      setEditorID(EDITOR_ID_EDEFAULT);
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    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();
+
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (editorID: ");
+    result.append(editorID);
+    result.append(')');
+    return result.toString();
+  }
+
+  @Override
+  protected Object createInstance()
+  {
+    throw new UnsupportedOperationException("not implemented yet!");
+  }
+
+  @Override
+  protected void validateDefinition()
+  {
+    CheckUtil.checkState(getEditorID() != null && getEditorID().length() >= 0, "editor id not set!");
+  }
+} // EditorDefImpl
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
new file mode 100644
index 0000000000..7e2a7bc729
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/util/CDOUIDefsAdapterFactory.java
@@ -0,0 +1,179 @@
+/**
+ * <copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    André Dietisheim - initial API and implementation
+ * </copyright>
+ *
+ * $Id: CDOUIDefsAdapterFactory.java,v 1.1 2008-12-31 14:43:07 estepper Exp $
+ */
+package org.eclipse.emf.cdo.ui.defs.util;
+
+import org.eclipse.emf.cdo.ui.defs.CDOEditorDef;
+import org.eclipse.emf.cdo.ui.defs.CDOUIDefsPackage;
+import org.eclipse.emf.cdo.ui.defs.EditorDef;
+
+import org.eclipse.net4j.util.defs.Def;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+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 -->
+   * 
+   * @generated
+   */
+  protected static CDOUIDefsPackage modelPackage;
+
+  /**
+   * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public CDOUIDefsAdapterFactory()
+  {
+    if (modelPackage == null)
+    {
+      modelPackage = CDOUIDefsPackage.eINSTANCE;
+    }
+  }
+
+  /**
+   * 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
+   */
+  @Override
+  public boolean isFactoryForType(Object object)
+  {
+    if (object == modelPackage)
+    {
+      return true;
+    }
+    if (object instanceof EObject)
+    {
+      return ((EObject)object).eClass().getEPackage() == modelPackage;
+    }
+    return false;
+  }
+
+  /**
+   * 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();
+    }
+  };
+
+  /**
+   * 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
+   */
+  @Override
+  public Adapter createAdapter(Notifier target)
+  {
+    return modelSwitch.doSwitch((EObject)target);
+  }
+
+  /**
+   * 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
+   */
+  public Adapter createEditorDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * 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
+   */
+  public Adapter createCDOEditorDefAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.Def <em>Def</em>}'. <!--
+   * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
+   * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+   * 
+   * @return the new adapter.
+   * @see org.eclipse.net4j.util.defs.Def
+   * @generated
+   */
+  public Adapter createDefAdapter()
+  {
+    return 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
+   */
+  public Adapter createEObjectAdapter()
+  {
+    return null;
+  }
+
+} // CDOUIDefsAdapterFactory
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
new file mode 100644
index 0000000000..623a22b9a8
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/util/CDOUIDefsSwitch.java
@@ -0,0 +1,190 @@
+/**
+ * <copyright>
+ * Copyright (c) 2004 - 2008 André Dietisheim, Switzerland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    André Dietisheim - initial API and implementation
+ * </copyright>
+ *
+ * $Id: CDOUIDefsSwitch.java,v 1.1 2008-12-31 14:43:07 estepper Exp $
+ */
+package org.eclipse.emf.cdo.ui.defs.util;
+
+import org.eclipse.emf.cdo.ui.defs.CDOEditorDef;
+import org.eclipse.emf.cdo.ui.defs.CDOUIDefsPackage;
+import org.eclipse.emf.cdo.ui.defs.EditorDef;
+
+import org.eclipse.net4j.util.defs.Def;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+import java.util.List;
+
+/**
+ * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
+ * {@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 -->
+   * 
+   * @generated
+   */
+  protected static CDOUIDefsPackage modelPackage;
+
+  /**
+   * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public CDOUIDefsSwitch()
+  {
+    if (modelPackage == null)
+    {
+      modelPackage = CDOUIDefsPackage.eINSTANCE;
+    }
+  }
+
+  /**
+   * 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
+   */
+  public T doSwitch(EObject theEObject)
+  {
+    return doSwitch(theEObject.eClass(), theEObject);
+  }
+
+  /**
+   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
+   * @generated
+   */
+  protected T doSwitch(EClass theEClass, EObject theEObject)
+  {
+    if (theEClass.eContainer() == modelPackage)
+    {
+      return doSwitch(theEClass.getClassifierID(), theEObject);
+    }
+    else
+    {
+      List<EClass> eSuperTypes = theEClass.getESuperTypes();
+      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
+   */
+  protected T doSwitch(int classifierID, EObject theEObject)
+  {
+    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);
+    }
+  }
+
+  /**
+   * 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.
+   * @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
+   */
+  public T caseEditorDef(EditorDef object)
+  {
+    return null;
+  }
+
+  /**
+   * 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.
+   * @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
+   */
+  public T caseCDOEditorDef(CDOEditorDef object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Def</em>'. <!-- begin-user-doc --> This
+   * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+   * 
+   * @param object
+   *          the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Def</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseDef(Def object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
+   * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
+   * anyway. <!-- end-user-doc -->
+   * 
+   * @param object
+   *          the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+   * @generated
+   */
+  public T defaultCase(EObject object)
+  {
+    return null;
+  }
+
+} // CDOUIDefsSwitch