UPDATED: MM generation

12 files changed, 226 insertions, 123 deletions

diff --git a/plugins/org.eclipse.emf.eef.views/model/views.components b/plugins/org.eclipse.emf.eef.views/model/views.components
index 40b3d7b24..6976e28e9 100644
--- a/plugins/org.eclipse.emf.eef.views/model/views.components
+++ b/plugins/org.eclipse.emf.eef.views/model/views.components
@@ -43,6 +43,9 @@
         <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_C2Y-Zgd9Ed6YkIySVKIecQ" name="readOnly" views="_C2Y-nwd9Ed6YkIySVKIecQ">
           <model xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.eef.views/model/views.ecore#//ElementEditor/readOnly"/>
         </properties>
+        <properties xsi:type="eef-components:PropertiesEditionElement" xmi:id="_Xn_wEMpCEeC96sWmxMtyBA" name="nameAsLabel" views="_UgHZIMpCEeC96sWmxMtyBA">
+          <model xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.eef.views/model/views.ecore#//ElementEditor/nameAsLabel"/>
+        </properties>
         <referencedBinding xmi:id="_z0zMIAtmEd6B37SLkBAPJA" binding="_U6-YQAtmEd6B37SLkBAPJA"/>
         <model xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.emf.eef.views/model/views.ecore#//ElementEditor"/>
       </bindings>
@@ -146,6 +149,9 @@
           <elements xsi:type="eef-views:ElementEditor" xmi:id="_C2Y-nwd9Ed6YkIySVKIecQ" name="readOnly">
             <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.1"/>
           </elements>
+          <elements xsi:type="eef-views:ElementEditor" xmi:id="_UgHZIMpCEeC96sWmxMtyBA" name="nameAsLabel">
+            <representation href="platform:/plugin/org.eclipse.emf.eef.views/std/SWT.toolkits#//@widgets.1"/>
+          </elements>
         </elements>
       </views>
       <views xmi:id="_C2Y-oAd9Ed6YkIySVKIecQ" name="Category">
diff --git a/plugins/org.eclipse.emf.eef.views/model/views.ecore b/plugins/org.eclipse.emf.eef.views/model/views.ecore
index 529a5ff37..e9cf3b4fc 100644
--- a/plugins/org.eclipse.emf.eef.views/model/views.ecore
+++ b/plugins/org.eclipse.emf.eef.views/model/views.ecore
@@ -23,15 +23,16 @@
   <eClassifiers xsi:type="ecore:EClass" name="ElementEditor" eSuperTypes="#//ViewElement #//IdentifiedElement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="readOnly" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nameAsLabel" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Category" eSuperTypes="#//DocumentedElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="views" upperBound="-1"
         eType="#//View" containment="true" eOpposite="#//View/category"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="repository" eType="#//ViewsRepository"
         eOpposite="#//ViewsRepository/categories"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="categories" upperBound="-1"
         eType="#//Category" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Container" eSuperTypes="#//ViewElement #//IdentifiedElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="elements" upperBound="-1"
diff --git a/plugins/org.eclipse.emf.eef.views/model/views.ecorediag b/plugins/org.eclipse.emf.eef.views/model/views.ecorediag
index 9f0bea997..3dd2794a8 100644
--- a/plugins/org.eclipse.emf.eef.views/model/views.ecorediag
+++ b/plugins/org.eclipse.emf.eef.views/model/views.ecorediag
@@ -35,7 +35,7 @@
       </children>
       <styles xmi:type="notation:ShapeStyle" xmi:id="_USm6nKEUEd2AHMZKEcVVmw" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
       <element xmi:type="ecore:EClass" href="views.ecore#//View"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_USm6naEUEd2AHMZKEcVVmw" x="640" y="536"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_USm6naEUEd2AHMZKEcVVmw" x="520" y="355"/>
     </children>
     <children xmi:type="notation:Node" xmi:id="_USovwqEUEd2AHMZKEcVVmw" type="1001">
       <children xmi:type="notation:Node" xmi:id="_USovxaEUEd2AHMZKEcVVmw" type="4001"/>
@@ -44,6 +44,10 @@
           <element xmi:type="ecore:EAttribute" href="views.ecore#//ElementEditor/readOnly"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_AB0dEacWEd2St_MHpApMXw"/>
         </children>
+        <children xmi:type="notation:Node" xmi:id="_CosEkMpCEeC96sWmxMtyBA" type="2001">
+          <element xmi:type="ecore:EAttribute" href="views.ecore#//ElementEditor/nameAsLabel"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_CosEkcpCEeC96sWmxMtyBA"/>
+        </children>
         <styles xmi:type="notation:DrawerStyle" xmi:id="_USovx6EUEd2AHMZKEcVVmw"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_USovyKEUEd2AHMZKEcVVmw"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_USovyaEUEd2AHMZKEcVVmw"/>
@@ -55,7 +59,7 @@
       </children>
       <styles xmi:type="notation:ShapeStyle" xmi:id="_USovw6EUEd2AHMZKEcVVmw" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
       <element xmi:type="ecore:EClass" href="views.ecore#//ElementEditor"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_USovxKEUEd2AHMZKEcVVmw" x="264" y="440"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_USovxKEUEd2AHMZKEcVVmw" x="840" y="290"/>
     </children>
     <children xmi:type="notation:Node" xmi:id="_USpW0qEUEd2AHMZKEcVVmw" type="1002">
       <children xmi:type="notation:Node" xmi:id="_USpW1qEUEd2AHMZKEcVVmw" type="4006"/>
@@ -87,7 +91,7 @@
       </children>
       <styles xmi:type="notation:ShapeStyle" xmi:id="_CQWcoaUSEd2QP4v9KcP_xA" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
       <element xmi:type="ecore:EClass" href="views.ecore#//Category"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CQWcoqUSEd2QP4v9KcP_xA" x="112" y="64"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CQWcoqUSEd2QP4v9KcP_xA" x="150" y="25"/>
     </children>
     <children xmi:type="notation:Node" xmi:id="_sDlWoKZdEd2Mw8dGut_bPQ" type="1001">
       <children xmi:type="notation:Node" xmi:id="_sEjnAKZdEd2Mw8dGut_bPQ" type="4001"/>
@@ -103,26 +107,7 @@
       </children>
       <styles xmi:type="notation:ShapeStyle" xmi:id="_sDlWoaZdEd2Mw8dGut_bPQ" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
       <element xmi:type="ecore:EClass" href="views.ecore#//Container"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sDlWoqZdEd2Mw8dGut_bPQ" x="464" y="444"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_wLPvkKZdEd2Mw8dGut_bPQ" type="1001">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wLkfsKZdEd2Mw8dGut_bPQ" source="Shortcut">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wLkfsaZdEd2Mw8dGut_bPQ" key="modelID" value="EcoreTools"/>
-      </eAnnotations>
-      <children xmi:type="notation:Node" xmi:id="_wLXrYKZdEd2Mw8dGut_bPQ" type="4001"/>
-      <children xmi:type="notation:Node" xmi:id="_wLYScKZdEd2Mw8dGut_bPQ" type="5001">
-        <styles xmi:type="notation:DrawerStyle" xmi:id="_wLYScaZdEd2Mw8dGut_bPQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_wLYScqZdEd2Mw8dGut_bPQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_wLYSc6ZdEd2Mw8dGut_bPQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_wLYSdKZdEd2Mw8dGut_bPQ" type="5002">
-        <styles xmi:type="notation:DrawerStyle" xmi:id="_wLYSdaZdEd2Mw8dGut_bPQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_wLYSdqZdEd2Mw8dGut_bPQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_wLYSd6ZdEd2Mw8dGut_bPQ"/>
-      </children>
-      <styles xmi:type="notation:ShapeStyle" xmi:id="_wLPvkaZdEd2Mw8dGut_bPQ" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
-      <element xmi:type="ecore:EClass" href="views.ecore#//toolkits/Widget"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wLPvkqZdEd2Mw8dGut_bPQ" x="400" y="644"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sDlWoqZdEd2Mw8dGut_bPQ" x="500" y="245"/>
     </children>
     <children xmi:type="notation:Node" xmi:id="_hCHs8KZgEd2Mw8dGut_bPQ" type="1001">
       <children xmi:type="notation:Node" xmi:id="_hCJiIKZgEd2Mw8dGut_bPQ" type="4001"/>
@@ -142,7 +127,7 @@
       </children>
       <styles xmi:type="notation:ShapeStyle" xmi:id="_hCHs8aZgEd2Mw8dGut_bPQ" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
       <element xmi:type="ecore:EClass" href="views.ecore#//ViewElement"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hCHs8qZgEd2Mw8dGut_bPQ" x="156" y="260"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hCHs8qZgEd2Mw8dGut_bPQ" x="620" y="115"/>
     </children>
     <children xmi:type="notation:Node" xmi:id="_Df1eUKZhEd2Mw8dGut_bPQ" type="1001">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Df8zEKZhEd2Mw8dGut_bPQ" source="Shortcut">
@@ -161,23 +146,23 @@
       </children>
       <styles xmi:type="notation:ShapeStyle" xmi:id="_Df1eUaZhEd2Mw8dGut_bPQ" fontName="Sans" fontHeight="10" fillColor="13761016" lineColor="0"/>
       <element xmi:type="ecore:EClass" href="views.ecore#//toolkits/Widget"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Df2FYKZhEd2Mw8dGut_bPQ" x="690" y="280"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Df2FYKZhEd2Mw8dGut_bPQ" x="1060" y="105"/>
     </children>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_USlFYaEUEd2AHMZKEcVVmw"/>
     <element xmi:type="ecore:EPackage" href="views.ecore#/"/>
     <edges xmi:type="notation:Edge" xmi:id="_USpW26EUEd2AHMZKEcVVmw" type="3002" source="_USmTgKEUEd2AHMZKEcVVmw" target="_USm6m6EUEd2AHMZKEcVVmw">
       <children xmi:type="notation:Node" xmi:id="_USp94qEUEd2AHMZKEcVVmw" type="4011">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_USp946EUEd2AHMZKEcVVmw" x="-10" y="-10"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_USp946EUEd2AHMZKEcVVmw" x="-31" y="-48"/>
       </children>
       <children xmi:type="notation:Node" xmi:id="_USp95KEUEd2AHMZKEcVVmw" type="4012">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_USp95aEUEd2AHMZKEcVVmw" x="10" y="10"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_USp95aEUEd2AHMZKEcVVmw" x="16" y="-38"/>
       </children>
-      <styles xmi:type="notation:ConnectorStyle" xmi:id="_USpW3KEUEd2AHMZKEcVVmw" lineColor="0"/>
+      <styles xmi:type="notation:ConnectorStyle" xmi:id="_USpW3KEUEd2AHMZKEcVVmw" routing="Rectilinear" lineColor="0"/>
       <styles xmi:type="notation:FontStyle" xmi:id="_USp94KEUEd2AHMZKEcVVmw" fontName="Sans" fontHeight="10"/>
       <element xmi:type="ecore:EReference" href="views.ecore#//ViewsRepository/views"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_USp94aEUEd2AHMZKEcVVmw" points="[-90, -1, -55, -153]$[-35, 140, 0, -12]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VoHBwKHAEd2NBcqSN9i4UQ" id="(0.5,0.5)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VoHBwaHAEd2NBcqSN9i4UQ" id="(0.21774194,0.26530612)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_USp94aEUEd2AHMZKEcVVmw" points="[-28, 25, -81, -296]$[-28, 332, -81, 11]$[32, 332, -21, 11]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9xYXYMpBEeC96sWmxMtyBA" id="(0.5,0.5)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9xYXYcpBEeC96sWmxMtyBA" id="(0.21774194,0.26530612)"/>
     </edges>
     <edges xmi:type="notation:Edge" xmi:id="_TdGiwKHAEd2NBcqSN9i4UQ" type="3002" source="_USm6m6EUEd2AHMZKEcVVmw" target="_USmTgKEUEd2AHMZKEcVVmw">
       <children xmi:type="notation:Node" xmi:id="_TdJmEKHAEd2NBcqSN9i4UQ" type="4011">
@@ -186,21 +171,21 @@
       <children xmi:type="notation:Node" xmi:id="_TdJmEqHAEd2NBcqSN9i4UQ" type="4012">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_TdKNIKHAEd2NBcqSN9i4UQ" x="10" y="10"/>
       </children>
-      <styles xmi:type="notation:ConnectorStyle" xmi:id="_TdGiwaHAEd2NBcqSN9i4UQ" lineColor="0"/>
+      <styles xmi:type="notation:ConnectorStyle" xmi:id="_TdGiwaHAEd2NBcqSN9i4UQ" routing="Rectilinear" lineColor="0"/>
       <styles xmi:type="notation:FontStyle" xmi:id="_TdGiwqHAEd2NBcqSN9i4UQ" fontName="Sans" fontHeight="10"/>
       <element xmi:type="ecore:EReference" href="views.ecore#//View/repository"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TdGiw6HAEd2NBcqSN9i4UQ" points="[0, -12, -35, 140]$[-55, -153, -90, -1]"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TdGiw6HAEd2NBcqSN9i4UQ" points="[-21, 11, 32, 332]$[-81, 11, -28, 332]$[-81, -296, -28, 25]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TdN3gKHAEd2NBcqSN9i4UQ" id="(0.21774194,0.26530612)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VoElgKHAEd2NBcqSN9i4UQ" id="(0.5,0.5)"/>
     </edges>
     <edges xmi:type="notation:Edge" xmi:id="_DV3TMKUSEd2QP4v9KcP_xA" type="3002" source="_USmTgKEUEd2AHMZKEcVVmw" target="_CQWcoKUSEd2QP4v9KcP_xA">
       <children xmi:type="notation:Node" xmi:id="_DV36QKUSEd2QP4v9KcP_xA" type="4011">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DV36QaUSEd2QP4v9KcP_xA" x="-10" y="-10"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DV36QaUSEd2QP4v9KcP_xA" x="-17" y="-9"/>
       </children>
       <children xmi:type="notation:Node" xmi:id="_DV36QqUSEd2QP4v9KcP_xA" type="4012">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DV36Q6USEd2QP4v9KcP_xA" x="10" y="10"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DV36Q6USEd2QP4v9KcP_xA" x="-14" y="11"/>
       </children>
-      <styles xmi:type="notation:ConnectorStyle" xmi:id="_DV3TMaUSEd2QP4v9KcP_xA" lineColor="0"/>
+      <styles xmi:type="notation:ConnectorStyle" xmi:id="_DV3TMaUSEd2QP4v9KcP_xA" routing="Rectilinear" lineColor="0"/>
       <styles xmi:type="notation:FontStyle" xmi:id="_DV3TMqUSEd2QP4v9KcP_xA" fontName="Sans" fontHeight="10"/>
       <element xmi:type="ecore:EReference" href="views.ecore#//ViewsRepository/categories"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DV3TM6USEd2QP4v9KcP_xA" points="[-33, 28, 166, -140]$[-249, 168, -50, 0]"/>
@@ -211,12 +196,12 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_I8jO4aUSEd2QP4v9KcP_xA" x="-10" y="-10"/>
       </children>
       <children xmi:type="notation:Node" xmi:id="_I8jO4qUSEd2QP4v9KcP_xA" type="4012">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_I8jO46USEd2QP4v9KcP_xA" x="10" y="10"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_I8jO46USEd2QP4v9KcP_xA" x="-20" y="13"/>
       </children>
-      <styles xmi:type="notation:ConnectorStyle" xmi:id="_I8iAwaUSEd2QP4v9KcP_xA" lineColor="0"/>
+      <styles xmi:type="notation:ConnectorStyle" xmi:id="_I8iAwaUSEd2QP4v9KcP_xA" routing="Rectilinear" lineColor="0"/>
       <styles xmi:type="notation:FontStyle" xmi:id="_I8iAwqUSEd2QP4v9KcP_xA" fontName="Sans" fontHeight="10"/>
       <element xmi:type="ecore:EReference" href="views.ecore#//Category/views"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_I8iAw6USEd2QP4v9KcP_xA" points="[50, -2, -150, 7]$[190, -11, -10, -2]"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_I8iAw6USEd2QP4v9KcP_xA" points="[-7, 25, -323, -294]$[-7, 346, -323, 27]$[308, 346, -8, 27]"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_I8m5QKUSEd2QP4v9KcP_xA" id="(0.08064516,0.3265306)"/>
     </edges>
     <edges xmi:type="notation:Edge" xmi:id="_-yOnEKZdEd2Mw8dGut_bPQ" type="3002" source="_sDlWoKZdEd2Mw8dGut_bPQ" target="_hCHs8KZgEd2Mw8dGut_bPQ">
@@ -226,26 +211,26 @@
       <children xmi:type="notation:Node" xmi:id="_-ySRcqZdEd2Mw8dGut_bPQ" type="4012">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_-ySRc6ZdEd2Mw8dGut_bPQ" x="10" y="10"/>
       </children>
-      <styles xmi:type="notation:ConnectorStyle" xmi:id="_-yOnEaZdEd2Mw8dGut_bPQ" lineColor="0"/>
+      <styles xmi:type="notation:ConnectorStyle" xmi:id="_-yOnEaZdEd2Mw8dGut_bPQ" routing="Rectilinear" lineColor="0"/>
       <styles xmi:type="notation:FontStyle" xmi:id="_-yOnEqZdEd2Mw8dGut_bPQ" fontName="Sans" fontHeight="10"/>
       <element xmi:type="ecore:EReference" href="views.ecore#//Container/elements"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-yOnE6ZdEd2Mw8dGut_bPQ" points="[18, 8, -165, -15]$[168, 21, -15, -2]"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-yOnE6ZdEd2Mw8dGut_bPQ" points="[-59, -33, -216, 99]$[-59, -138, -216, -6]$[41, -138, -116, -6]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9QzQKZeEd2Mw8dGut_bPQ" id="(0.79,0.80487806)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H9QzQaZeEd2Mw8dGut_bPQ" id="(0.9423077,0.63414633)"/>
     </edges>
     <edges xmi:type="notation:Edge" xmi:id="_DTZsMKZeEd2Mw8dGut_bPQ" type="3002" source="_hCHs8KZgEd2Mw8dGut_bPQ" target="_sDlWoKZdEd2Mw8dGut_bPQ">
       <children xmi:type="notation:Node" xmi:id="_DTdWkKZeEd2Mw8dGut_bPQ" type="4011">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DTdWkaZeEd2Mw8dGut_bPQ" x="-10" y="-10"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DTdWkaZeEd2Mw8dGut_bPQ" x="-11" y="5"/>
       </children>
       <children xmi:type="notation:Node" xmi:id="_DTd9oKZeEd2Mw8dGut_bPQ" type="4012">
         <layoutConstraint xmi:type="notation:Location" xmi:id="_DTd9oaZeEd2Mw8dGut_bPQ" x="10" y="10"/>
       </children>
-      <styles xmi:type="notation:ConnectorStyle" xmi:id="_DTZsMaZeEd2Mw8dGut_bPQ" lineColor="0"/>
+      <styles xmi:type="notation:ConnectorStyle" xmi:id="_DTZsMaZeEd2Mw8dGut_bPQ" routing="Rectilinear" lineColor="0"/>
       <styles xmi:type="notation:FontStyle" xmi:id="_DTZsMqZeEd2Mw8dGut_bPQ" fontName="Sans" fontHeight="10"/>
       <element xmi:type="ecore:EReference" href="views.ecore#//ViewElement/container"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DTZsM6ZeEd2Mw8dGut_bPQ" points="[-15, -2, 168, 21]$[-165, -15, 18, 8]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WPq3YKaqEd2Ow6vQtpdAPg" id="(0.9423077,0.63414633)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WPq3YaaqEd2Ow6vQtpdAPg" id="(0.79,0.80487806)"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DTZsM6ZeEd2Mw8dGut_bPQ" points="[-116, -6, 41, -138]$[-216, -6, -59, -138]$[-216, 99, -59, -33]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_As0NwMpCEeC96sWmxMtyBA" id="(0.9423077,0.63414633)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_As000MpCEeC96sWmxMtyBA" id="(0.79,0.80487806)"/>
     </edges>
     <edges xmi:type="notation:Edge" xmi:id="_keRqwKZgEd2Mw8dGut_bPQ" type="3003" source="_USovwqEUEd2AHMZKEcVVmw" target="_hCHs8KZgEd2Mw8dGut_bPQ">
       <styles xmi:type="notation:ConnectorStyle" xmi:id="_keRqwaZgEd2Mw8dGut_bPQ" routing="Tree" lineColor="0"/>
diff --git a/plugins/org.eclipse.emf.eef.views/model/views.genmodel b/plugins/org.eclipse.emf.eef.views/model/views.genmodel
index 0af50c34b..3def65bb8 100644
--- a/plugins/org.eclipse.emf.eef.views/model/views.genmodel
+++ b/plugins/org.eclipse.emf.eef.views/model/views.genmodel
@@ -30,15 +30,16 @@
     <genClasses ecoreClass="views.ecore#//ElementEditor">
       <genFeatures createChild="false" propertyDescription="Defines that this editor is in read only mode"
           ecoreFeature="ecore:EAttribute views.ecore#//ElementEditor/readOnly"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute views.ecore#//ElementEditor/nameAsLabel"/>
     </genClasses>
     <genClasses ecoreClass="views.ecore#//Category">
       <genFeatures property="None" children="true" createChild="true" propertyDescription="The views of the category"
           ecoreFeature="ecore:EReference views.ecore#//Category/views"/>
-      <genFeatures createChild="false" propertyDescription="The category name" ecoreFeature="ecore:EAttribute views.ecore#//Category/name"/>
       <genFeatures property="None" notify="false" createChild="false" propertyDescription="The owning repository"
           ecoreFeature="ecore:EReference views.ecore#//Category/repository"/>
       <genFeatures property="None" children="true" createChild="true" propertyDescription="The sub-categories"
           ecoreFeature="ecore:EReference views.ecore#//Category/categories"/>
+      <genFeatures createChild="false" propertyDescription="The category name" ecoreFeature="ecore:EAttribute views.ecore#//Category/name"/>
     </genClasses>
     <genClasses ecoreClass="views.ecore#//Container">
       <genFeatures property="None" children="true" createChild="true" propertyDescription="The owned elements"
diff --git a/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/toolkits/util/ToolkitsSwitch.java b/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/toolkits/util/ToolkitsSwitch.java
index 53fe24595..e5f4fa482 100644
--- a/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/toolkits/util/ToolkitsSwitch.java
+++ b/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/toolkits/util/ToolkitsSwitch.java
@@ -14,6 +14,8 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
 import org.eclipse.emf.eef.toolkits.*;
 import org.eclipse.emf.eef.toolkits.Toolkit;
 import org.eclipse.emf.eef.toolkits.ToolkitsPackage;
@@ -32,7 +34,7 @@ import org.eclipse.emf.eef.toolkits.Widget;
  * @see org.eclipse.emf.eef.toolkits.ToolkitsPackage
  * @generated
  */
-public class ToolkitsSwitch<T> {
+public class ToolkitsSwitch<T> extends Switch<T> {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
@@ -54,30 +56,16 @@ public class ToolkitsSwitch<T> {
 	}
 
 	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	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.
+	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @parameter ePackage the package in question.
+	 * @return whether this is a switch for the given package.
 	 * @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);
-		}
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
 	}
 
 	/**
@@ -87,6 +75,7 @@ public class ToolkitsSwitch<T> {
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
+	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
 		case ToolkitsPackage.TOOLKIT: {
@@ -149,6 +138,7 @@ public class ToolkitsSwitch<T> {
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
 	 */
+	@Override
 	public T defaultCase(EObject object) {
 		return null;
 	}
diff --git a/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/Category.java b/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/Category.java
index 0a0b64e3a..1238fae7c 100644
--- a/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/Category.java
+++ b/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/Category.java
@@ -21,9 +21,9 @@ import org.eclipse.emf.common.util.EList;
  * The following features are supported:
  * <ul>
  *   <li>{@link org.eclipse.emf.eef.views.Category#getViews <em>Views</em>}</li>
- *   <li>{@link org.eclipse.emf.eef.views.Category#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.emf.eef.views.Category#getRepository <em>Repository</em>}</li>
  *   <li>{@link org.eclipse.emf.eef.views.Category#getCategories <em>Categories</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.views.Category#getName <em>Name</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/ElementEditor.java b/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/ElementEditor.java
index fcbe3d3ce..89db88570 100644
--- a/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/ElementEditor.java
+++ b/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/ElementEditor.java
@@ -19,6 +19,7 @@ package org.eclipse.emf.eef.views;
  * The following features are supported:
  * <ul>
  *   <li>{@link org.eclipse.emf.eef.views.ElementEditor#isReadOnly <em>Read Only</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.views.ElementEditor#isNameAsLabel <em>Name As Label</em>}</li>
  * </ul>
  * </p>
  *
@@ -53,4 +54,30 @@ public interface ElementEditor extends ViewElement, IdentifiedElement {
 	 */
 	void setReadOnly(boolean value);
 
+	/**
+	 * Returns the value of the '<em><b>Name As Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name As Label</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Name As Label</em>' attribute.
+	 * @see #setNameAsLabel(boolean)
+	 * @see org.eclipse.emf.eef.views.ViewsPackage#getElementEditor_NameAsLabel()
+	 * @model
+	 * @generated
+	 */
+	boolean isNameAsLabel();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.eef.views.ElementEditor#isNameAsLabel <em>Name As Label</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Name As Label</em>' attribute.
+	 * @see #isNameAsLabel()
+	 * @generated
+	 */
+	void setNameAsLabel(boolean value);
+
 } // ElementEditor
diff --git a/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/ViewsPackage.java b/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/ViewsPackage.java
index 3c1b6138c..1bd7391c9 100644
--- a/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/ViewsPackage.java
+++ b/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/ViewsPackage.java
@@ -457,13 +457,22 @@ public interface ViewsPackage extends EPackage {
 	int ELEMENT_EDITOR__READ_ONLY = VIEW_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
+	 * The feature id for the '<em><b>Name As Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ELEMENT_EDITOR__NAME_AS_LABEL = VIEW_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
 	 * The number of structural features of the '<em>Element Editor</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT_EDITOR_FEATURE_COUNT = VIEW_ELEMENT_FEATURE_COUNT + 2;
+	int ELEMENT_EDITOR_FEATURE_COUNT = VIEW_ELEMENT_FEATURE_COUNT + 3;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.eef.views.impl.CategoryImpl <em>Category</em>}' class.
@@ -494,31 +503,31 @@ public interface ViewsPackage extends EPackage {
 	int CATEGORY__VIEWS = DOCUMENTED_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * The feature id for the '<em><b>Repository</b></em>' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CATEGORY__NAME = DOCUMENTED_ELEMENT_FEATURE_COUNT + 1;
+	int CATEGORY__REPOSITORY = DOCUMENTED_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Repository</b></em>' container reference.
+	 * The feature id for the '<em><b>Categories</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CATEGORY__REPOSITORY = DOCUMENTED_ELEMENT_FEATURE_COUNT + 2;
+	int CATEGORY__CATEGORIES = DOCUMENTED_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Categories</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CATEGORY__CATEGORIES = DOCUMENTED_ELEMENT_FEATURE_COUNT + 3;
+	int CATEGORY__NAME = DOCUMENTED_ELEMENT_FEATURE_COUNT + 3;
 
 	/**
 	 * The number of structural features of the '<em>Category</em>' class.
@@ -594,6 +603,15 @@ public interface ViewsPackage extends EPackage {
 	int CUSTOM_ELEMENT_EDITOR__READ_ONLY = ELEMENT_EDITOR__READ_ONLY;
 
 	/**
+	 * The feature id for the '<em><b>Name As Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CUSTOM_ELEMENT_EDITOR__NAME_AS_LABEL = ELEMENT_EDITOR__NAME_AS_LABEL;
+
+	/**
 	 * The number of structural features of the '<em>Custom Element Editor</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -922,6 +940,17 @@ public interface ViewsPackage extends EPackage {
 	EAttribute getElementEditor_ReadOnly();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.eef.views.ElementEditor#isNameAsLabel <em>Name As Label</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Name As Label</em>'.
+	 * @see org.eclipse.emf.eef.views.ElementEditor#isNameAsLabel()
+	 * @see #getElementEditor()
+	 * @generated
+	 */
+	EAttribute getElementEditor_NameAsLabel();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.emf.eef.views.Category <em>Category</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1239,6 +1268,14 @@ public interface ViewsPackage extends EPackage {
 		EAttribute ELEMENT_EDITOR__READ_ONLY = eINSTANCE.getElementEditor_ReadOnly();
 
 		/**
+		 * The meta object literal for the '<em><b>Name As Label</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ELEMENT_EDITOR__NAME_AS_LABEL = eINSTANCE.getElementEditor_NameAsLabel();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.emf.eef.views.impl.CategoryImpl <em>Category</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/impl/CategoryImpl.java b/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/impl/CategoryImpl.java
index f6485ce13..f90fb4bf8 100644
--- a/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/impl/CategoryImpl.java
+++ b/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/impl/CategoryImpl.java
@@ -35,9 +35,9 @@ import org.eclipse.emf.eef.views.ViewsRepository;
  * The following features are implemented:
  * <ul>
  *   <li>{@link org.eclipse.emf.eef.views.impl.CategoryImpl#getViews <em>Views</em>}</li>
- *   <li>{@link org.eclipse.emf.eef.views.impl.CategoryImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.emf.eef.views.impl.CategoryImpl#getRepository <em>Repository</em>}</li>
  *   <li>{@link org.eclipse.emf.eef.views.impl.CategoryImpl#getCategories <em>Categories</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.views.impl.CategoryImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
  *
@@ -55,34 +55,34 @@ public class CategoryImpl extends DocumentedElementImpl implements Category {
 	protected EList<View> views;
 
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * The cached value of the '{@link #getCategories() <em>Categories</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getName()
+	 * @see #getCategories()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String NAME_EDEFAULT = null;
+	protected EList<Category> categories;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see #getName()
 	 * @generated
 	 * @ordered
 	 */
-	protected String name = NAME_EDEFAULT;
+	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getCategories() <em>Categories</em>}' containment reference list.
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getCategories()
+	 * @see #getName()
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<Category> categories;
+	protected String name = NAME_EDEFAULT;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -251,12 +251,12 @@ public class CategoryImpl extends DocumentedElementImpl implements Category {
 		switch (featureID) {
 		case ViewsPackage.CATEGORY__VIEWS:
 			return getViews();
-		case ViewsPackage.CATEGORY__NAME:
-			return getName();
 		case ViewsPackage.CATEGORY__REPOSITORY:
 			return getRepository();
 		case ViewsPackage.CATEGORY__CATEGORIES:
 			return getCategories();
+		case ViewsPackage.CATEGORY__NAME:
+			return getName();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -274,9 +274,6 @@ public class CategoryImpl extends DocumentedElementImpl implements Category {
 			getViews().clear();
 			getViews().addAll((Collection<? extends View>) newValue);
 			return;
-		case ViewsPackage.CATEGORY__NAME:
-			setName((String) newValue);
-			return;
 		case ViewsPackage.CATEGORY__REPOSITORY:
 			setRepository((ViewsRepository) newValue);
 			return;
@@ -284,6 +281,9 @@ public class CategoryImpl extends DocumentedElementImpl implements Category {
 			getCategories().clear();
 			getCategories().addAll((Collection<? extends Category>) newValue);
 			return;
+		case ViewsPackage.CATEGORY__NAME:
+			setName((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -299,15 +299,15 @@ public class CategoryImpl extends DocumentedElementImpl implements Category {
 		case ViewsPackage.CATEGORY__VIEWS:
 			getViews().clear();
 			return;
-		case ViewsPackage.CATEGORY__NAME:
-			setName(NAME_EDEFAULT);
-			return;
 		case ViewsPackage.CATEGORY__REPOSITORY:
 			setRepository((ViewsRepository) null);
 			return;
 		case ViewsPackage.CATEGORY__CATEGORIES:
 			getCategories().clear();
 			return;
+		case ViewsPackage.CATEGORY__NAME:
+			setName(NAME_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -322,12 +322,12 @@ public class CategoryImpl extends DocumentedElementImpl implements Category {
 		switch (featureID) {
 		case ViewsPackage.CATEGORY__VIEWS:
 			return views != null && !views.isEmpty();
-		case ViewsPackage.CATEGORY__NAME:
-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 		case ViewsPackage.CATEGORY__REPOSITORY:
 			return getRepository() != null;
 		case ViewsPackage.CATEGORY__CATEGORIES:
 			return categories != null && !categories.isEmpty();
+		case ViewsPackage.CATEGORY__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/impl/ElementEditorImpl.java b/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/impl/ElementEditorImpl.java
index 45a4c9323..b00510bc8 100644
--- a/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/impl/ElementEditorImpl.java
+++ b/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/impl/ElementEditorImpl.java
@@ -28,6 +28,7 @@ import org.eclispe.emf.eef.views.helpers.NamingHelper;
  * <ul>
  *   <li>{@link org.eclipse.emf.eef.views.impl.ElementEditorImpl#getQualifiedIdentifier <em>Qualified Identifier</em>}</li>
  *   <li>{@link org.eclipse.emf.eef.views.impl.ElementEditorImpl#isReadOnly <em>Read Only</em>}</li>
+ *   <li>{@link org.eclipse.emf.eef.views.impl.ElementEditorImpl#isNameAsLabel <em>Name As Label</em>}</li>
  * </ul>
  * </p>
  *
@@ -65,6 +66,26 @@ public class ElementEditorImpl extends ViewElementImpl implements ElementEditor
 	protected boolean readOnly = READ_ONLY_EDEFAULT;
 
 	/**
+	 * The default value of the '{@link #isNameAsLabel() <em>Name As Label</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isNameAsLabel()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean NAME_AS_LABEL_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isNameAsLabel() <em>Name As Label</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isNameAsLabel()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean nameAsLabel = NAME_AS_LABEL_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -131,6 +152,27 @@ public class ElementEditorImpl extends ViewElementImpl implements ElementEditor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public boolean isNameAsLabel() {
+		return nameAsLabel;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setNameAsLabel(boolean newNameAsLabel) {
+		boolean oldNameAsLabel = nameAsLabel;
+		nameAsLabel = newNameAsLabel;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ViewsPackage.ELEMENT_EDITOR__NAME_AS_LABEL, oldNameAsLabel, nameAsLabel));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
@@ -138,6 +180,8 @@ public class ElementEditorImpl extends ViewElementImpl implements ElementEditor
 			return getQualifiedIdentifier();
 		case ViewsPackage.ELEMENT_EDITOR__READ_ONLY:
 			return isReadOnly();
+		case ViewsPackage.ELEMENT_EDITOR__NAME_AS_LABEL:
+			return isNameAsLabel();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -153,6 +197,9 @@ public class ElementEditorImpl extends ViewElementImpl implements ElementEditor
 		case ViewsPackage.ELEMENT_EDITOR__READ_ONLY:
 			setReadOnly((Boolean) newValue);
 			return;
+		case ViewsPackage.ELEMENT_EDITOR__NAME_AS_LABEL:
+			setNameAsLabel((Boolean) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -168,6 +215,9 @@ public class ElementEditorImpl extends ViewElementImpl implements ElementEditor
 		case ViewsPackage.ELEMENT_EDITOR__READ_ONLY:
 			setReadOnly(READ_ONLY_EDEFAULT);
 			return;
+		case ViewsPackage.ELEMENT_EDITOR__NAME_AS_LABEL:
+			setNameAsLabel(NAME_AS_LABEL_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -184,6 +234,8 @@ public class ElementEditorImpl extends ViewElementImpl implements ElementEditor
 			return QUALIFIED_IDENTIFIER_EDEFAULT == null ? getQualifiedIdentifier() != null : !QUALIFIED_IDENTIFIER_EDEFAULT.equals(getQualifiedIdentifier());
 		case ViewsPackage.ELEMENT_EDITOR__READ_ONLY:
 			return readOnly != READ_ONLY_EDEFAULT;
+		case ViewsPackage.ELEMENT_EDITOR__NAME_AS_LABEL:
+			return nameAsLabel != NAME_AS_LABEL_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -237,6 +289,8 @@ public class ElementEditorImpl extends ViewElementImpl implements ElementEditor
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (readOnly: "); //$NON-NLS-1$
 		result.append(readOnly);
+		result.append(", nameAsLabel: "); //$NON-NLS-1$
+		result.append(nameAsLabel);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/impl/ViewsPackageImpl.java b/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/impl/ViewsPackageImpl.java
index eaf173d21..ceec18542 100644
--- a/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/impl/ViewsPackageImpl.java
+++ b/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/impl/ViewsPackageImpl.java
@@ -284,6 +284,15 @@ public class ViewsPackageImpl extends EPackageImpl implements ViewsPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EAttribute getElementEditor_NameAsLabel() {
+		return (EAttribute) elementEditorEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getCategory() {
 		return categoryEClass;
 	}
@@ -303,7 +312,7 @@ public class ViewsPackageImpl extends EPackageImpl implements ViewsPackage {
 	 * @generated
 	 */
 	public EAttribute getCategory_Name() {
-		return (EAttribute) categoryEClass.getEStructuralFeatures().get(1);
+		return (EAttribute) categoryEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -312,7 +321,7 @@ public class ViewsPackageImpl extends EPackageImpl implements ViewsPackage {
 	 * @generated
 	 */
 	public EReference getCategory_Repository() {
-		return (EReference) categoryEClass.getEStructuralFeatures().get(2);
+		return (EReference) categoryEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -321,7 +330,7 @@ public class ViewsPackageImpl extends EPackageImpl implements ViewsPackage {
 	 * @generated
 	 */
 	public EReference getCategory_Categories() {
-		return (EReference) categoryEClass.getEStructuralFeatures().get(3);
+		return (EReference) categoryEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -492,12 +501,13 @@ public class ViewsPackageImpl extends EPackageImpl implements ViewsPackage {
 
 		elementEditorEClass = createEClass(ELEMENT_EDITOR);
 		createEAttribute(elementEditorEClass, ELEMENT_EDITOR__READ_ONLY);
+		createEAttribute(elementEditorEClass, ELEMENT_EDITOR__NAME_AS_LABEL);
 
 		categoryEClass = createEClass(CATEGORY);
 		createEReference(categoryEClass, CATEGORY__VIEWS);
-		createEAttribute(categoryEClass, CATEGORY__NAME);
 		createEReference(categoryEClass, CATEGORY__REPOSITORY);
 		createEReference(categoryEClass, CATEGORY__CATEGORIES);
+		createEAttribute(categoryEClass, CATEGORY__NAME);
 
 		containerEClass = createEClass(CONTAINER);
 		createEReference(containerEClass, CONTAINER__ELEMENTS);
@@ -585,15 +595,17 @@ public class ViewsPackageImpl extends EPackageImpl implements ViewsPackage {
 
 		initEClass(elementEditorEClass, ElementEditor.class, "ElementEditor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEAttribute(getElementEditor_ReadOnly(), ecorePackage.getEBoolean(), "readOnly", null, 1, 1, ElementEditor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getElementEditor_NameAsLabel(), ecorePackage.getEBoolean(), "nameAsLabel", null, 0, 1, ElementEditor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
 		initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEReference(getCategory_Views(), this.getView(), this.getView_Category(), "views", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 1, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEReference(getCategory_Repository(), this.getViewsRepository(), this.getViewsRepository_Categories(), "repository", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEReference(getCategory_Categories(), this.getCategory(), null, "categories", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 1, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
 		initEClass(containerEClass, org.eclipse.emf.eef.views.Container.class, "Container", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getContainer_Elements(), this.getViewElement(), this.getViewElement_Container(), "elements", null, 0, -1, org.eclipse.emf.eef.views.Container.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getContainer_Elements(), this.getViewElement(), this.getViewElement_Container(),
+				"elements", null, 0, -1, org.eclipse.emf.eef.views.Container.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
 		initEClass(viewElementEClass, ViewElement.class, "ViewElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEReference(getViewElement_Representation(), theToolkitsPackage.getWidget(), null, "representation", null, 0, 1, ViewElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/util/ViewsSwitch.java b/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/util/ViewsSwitch.java
index d68eb832e..67623e679 100644
--- a/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/util/ViewsSwitch.java
+++ b/plugins/org.eclipse.emf.eef.views/src-gen/org/eclipse/emf/eef/views/util/ViewsSwitch.java
@@ -14,6 +14,8 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
 import org.eclipse.emf.eef.views.*;
 import org.eclipse.emf.eef.views.Category;
 import org.eclipse.emf.eef.views.Container;
@@ -41,7 +43,7 @@ import org.eclipse.emf.eef.views.ViewsRepository;
  * @see org.eclipse.emf.eef.views.ViewsPackage
  * @generated
  */
-public class ViewsSwitch<T> {
+public class ViewsSwitch<T> extends Switch<T> {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
@@ -63,30 +65,16 @@ public class ViewsSwitch<T> {
 	}
 
 	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	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.
+	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @parameter ePackage the package in question.
+	 * @return whether this is a switch for the given package.
 	 * @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);
-		}
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
 	}
 
 	/**
@@ -96,6 +84,7 @@ public class ViewsSwitch<T> {
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
+	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
 		case ViewsPackage.VIEWS_REPOSITORY: {
@@ -408,6 +397,7 @@ public class ViewsSwitch<T> {
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
 	 */
+	@Override
 	public T defaultCase(EObject object) {
 		return null;
 	}