Bug 515367 - [releng] Uniformization of the end of lines to Unix standard

- Format the EOL of all the files matched by: grep -rIUs . | xargs -Ifile dos2unix -k 'file' Change-Id: I5c41d540a9a67b50de9b912ab35e16cc9a912961 Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
author: Quentin Le Menez 2018-01-09 10:09:46 +0000
committer: Quentin Le Menez 2018-01-09 13:18:15 +0000
commit: d98116b5b376f18b6cf626ba4158a35fe9a4a64e (patch)
tree: 4458c9c5ada0a216b385813a56ea9a9b8c7b6509 /plugins/developer/org.eclipse.papyrus.gmfgenextension
parent: 453e99bc2dcbd5fabad100f9d0d5f682013c3b19 (diff)
download: org.eclipse.papyrus-d98116b5b376f18b6cf626ba4158a35fe9a4a64e.tar.gz
org.eclipse.papyrus-d98116b5b376f18b6cf626ba4158a35fe9a4a64e.tar.xz
org.eclipse.papyrus-d98116b5b376f18b6cf626ba4158a35fe9a4a64e.zip
16 files changed, 1720 insertions, 1720 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/about.html b/plugins/developer/org.eclipse.papyrus.gmfgenextension/about.html
index a80e9697355..23506a4bae1 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/about.html
+++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/about.html
@@ -1,26 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head><body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+
+
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>About</title>
+</head><body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
 </body></html>
 \ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/build.properties b/plugins/developer/org.eclipse.papyrus.gmfgenextension/build.properties
index f856efdf73f..dde0974666b 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/build.properties
+++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/build.properties
@@ -1,17 +1,17 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id$
-
-bin.includes = .,\
-               model/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = about.html
+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+bin.includes = .,\
+               model/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               icons/,\
+               about.html
+jars.compile.order = .
+source.. = src/
+output.. = bin/
+src.includes = about.html
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/model/gmfgneExtension.uml b/plugins/developer/org.eclipse.papyrus.gmfgenextension/model/gmfgneExtension.uml
index d8af75cde08..3cd33f24df3 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/model/gmfgneExtension.uml
+++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/model/gmfgneExtension.uml
@@ -1,169 +1,169 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_Qh1r8N5PEd2H5qD714qFTA" name="PapyrusGmfgenExtension">
-  <ownedComment xmi:id="_-rSu4N5TEd2H5qD714qFTA" annotatedElement="_YeINEN5PEd2H5qD714qFTA">
-    <body>This element is always linked to a genNode (topLevel, or child)&#xD;
-Used set if an editPart is abstract.&#xD;
-SuperGenNodes is a list of all superEditPart.&#xD;
-&#xD;
-Thanks to this, it is possible to factorize code and to decrease the number of generated classes.</body>
-  </ownedComment>
-  <ownedComment xmi:id="_ngQ9QN5UEd2H5qD714qFTA" annotatedElement="_qPNzoN5QEd2H5qD714qFTA">
-    <body>All extended classes have a comment in order to describe the puprose of this extension</body>
-  </ownedComment>
-  <ownedComment xmi:id="_lxYf8N5cEd2H5qD714qFTA" annotatedElement="_hmemwN5REd2H5qD714qFTA">
-    <body>The purpose of this class is point to an external class (for example java classes).&#xD;
-the classpath is the path to the this extenal class.</body>
-  </ownedComment>
-  <ownedComment xmi:id="_N_m3YN5dEd2H5qD714qFTA" annotatedElement="_8_kJsN5PEd2H5qD714qFTA">
-    <body>This class is used to refresh the figure by taking in account a property of domain element (in the case of Ecore, it can be an Efeature or EReference)&#xD;
-The triggeringCondtion describe the needed condition to launch the action on the figure.  these two properties can be code lines.&#xD;
-&#xD;
-For instance we would like to display active class when the efeature class is &quot;active&quot;. Or display composite kind of the association when the kind of the property end is &quot;composite&quot;.</body>
-  </ownedComment>
-  <ownedComment xmi:id="_WHoR8N5eEd2H5qD714qFTA" annotatedElement="_J6ZzAN5REd2H5qD714qFTA">
-    <body>The purpose of this class is to define our own initializer.&#xD;
-For example in the case of UML, the intialize for name may be &quot;name&quot;_'number&quot;.&#xD;
-The initAction is code that call this helper use to fill static method &quot; String name_Metaclass_VisualID(Metaclass self) &quot;</body>
-  </ownedComment>
-  <ownedComment xmi:id="_jUDagN5fEd2H5qD714qFTA" annotatedElement="_N3We0N5TEd2H5qD714qFTA">
-    <body>This class is used to precise itw own locator used for the border item, like port or template.&#xD;
-&#xD;
-for example, in the case of templateSignature of ClassEditPart in the method protected boolean addFixedChild(EditPart childEditPart):&#xD;
-replacement of the general BorderItemLocator is needed in order to constrain the movement. &#xD;
-&#xD;
-if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {&#xD;
-   // BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.NORTH);&#xD;
-   BorderItemLocator locator = new TemplateClassifierBorderItemLocator(getMainFigure(), PositionConstants.NORTH);&#xD;
-   getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator);&#xD;
-   return true;&#xD;
-}</body>
-  </ownedComment>
-  <packageImport xmi:id="_Qh1r8d5PEd2H5qD714qFTA">
-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
-  </packageImport>
-  <packagedElement xmi:type="uml:Class" xmi:id="_RD9hkN5PEd2H5qD714qFTA" name="GenNode"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_YeINEN5PEd2H5qD714qFTA" name="ExtendedGenNode">
-    <generalization xmi:id="_wR5u0N5QEd2H5qD714qFTA" general="_nji3kN5QEd2H5qD714qFTA"/>
-    <ownedAttribute xmi:id="_e-KyoN5PEd2H5qD714qFTA" name="genNode" type="_RD9hkN5PEd2H5qD714qFTA" isUnique="false" association="_e-BosN5PEd2H5qD714qFTA">
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_e-Ujod5PEd2H5qD714qFTA" value="1"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_e-UjoN5PEd2H5qD714qFTA" value="1"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:id="_id1-gN5PEd2H5qD714qFTA" name="isAbstract" visibility="public" isUnique="false">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p9N6Id5PEd2H5qD714qFTA" value="1"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p9N6IN5PEd2H5qD714qFTA" value="1"/>
-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_p9N6It5PEd2H5qD714qFTA">
-        <value xsi:nil="true"/>
-      </defaultValue>
-    </ownedAttribute>
-    <ownedAttribute xmi:id="_wg_wMd5PEd2H5qD714qFTA" name="superGenNodes" type="_RD9hkN5PEd2H5qD714qFTA" isUnique="false" association="_wg_wMN5PEd2H5qD714qFTA">
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wg_wM95PEd2H5qD714qFTA" value="*"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wg_wMt5PEd2H5qD714qFTA"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:id="_IDYccd5QEd2H5qD714qFTA" name="propRefreshHook" type="_8_kJsN5PEd2H5qD714qFTA" isUnique="false" aggregation="composite" association="_IDYccN5QEd2H5qD714qFTA">
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IDiNcd5QEd2H5qD714qFTA" value="1"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IDiNcN5QEd2H5qD714qFTA"/>
-    </ownedAttribute>
-    <ownedAttribute xmi:id="_Cj0nAN5REd2H5qD714qFTA" name="intialilization" isUnique="false"/>
-    <ownedAttribute xmi:id="_XxMjsd5REd2H5qD714qFTA" name="nameInitHook" type="_J6ZzAN5REd2H5qD714qFTA" isUnique="false" association="_XxMjsN5REd2H5qD714qFTA">
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XxVtod5REd2H5qD714qFTA" value="1"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XxVtoN5REd2H5qD714qFTA"/>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_e-BosN5PEd2H5qD714qFTA" name="A_ExtendedGenNode_GenNode" memberEnd="_e-KyoN5PEd2H5qD714qFTA _e-Ujot5PEd2H5qD714qFTA">
-    <ownedEnd xmi:id="_e-Ujot5PEd2H5qD714qFTA" name="extendedGenNode" type="_YeINEN5PEd2H5qD714qFTA" isUnique="false" association="_e-BosN5PEd2H5qD714qFTA">
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_e-Ujo95PEd2H5qD714qFTA" value="*"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_e-UjpN5PEd2H5qD714qFTA"/>
-    </ownedEnd>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_wg_wMN5PEd2H5qD714qFTA" name="A_ExtendedGenNode_GenNode" memberEnd="_wg_wMd5PEd2H5qD714qFTA _wg_wNN5PEd2H5qD714qFTA">
-    <ownedEnd xmi:id="_wg_wNN5PEd2H5qD714qFTA" name="extendedGenNode" type="_YeINEN5PEd2H5qD714qFTA" isUnique="false" association="_wg_wMN5PEd2H5qD714qFTA">
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wg_wNd5PEd2H5qD714qFTA" value="*"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_whJhMN5PEd2H5qD714qFTA"/>
-    </ownedEnd>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_8_kJsN5PEd2H5qD714qFTA" name="PropertyRefreshHook">
-    <generalization xmi:id="_mX9YwN5REd2H5qD714qFTA" general="_hmemwN5REd2H5qD714qFTA"/>
-    <ownedAttribute xmi:id="_0KMK0N5XEd2H5qD714qFTA" name="triggeringCondition" visibility="public" isUnique="false">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5N2R8d5XEd2H5qD714qFTA" value="1"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5N2R8N5XEd2H5qD714qFTA" value="1"/>
-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_5N2R8t5XEd2H5qD714qFTA">
-        <value xsi:nil="true"/>
-      </defaultValue>
-    </ownedAttribute>
-    <ownedAttribute xmi:id="_mET_0N5YEd2H5qD714qFTA" name="action" visibility="public" isUnique="false">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qv_EwN5YEd2H5qD714qFTA" value="1"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qv1TwN5YEd2H5qD714qFTA" value="1"/>
-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_qv_Ewd5YEd2H5qD714qFTA">
-        <value xsi:nil="true"/>
-      </defaultValue>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_IDYccN5QEd2H5qD714qFTA" name="A_ExtendedGenNode_FeatureBehaviour" memberEnd="_IDYccd5QEd2H5qD714qFTA _IDiNct5QEd2H5qD714qFTA">
-    <ownedEnd xmi:id="_IDiNct5QEd2H5qD714qFTA" name="extendedGenNode" type="_YeINEN5PEd2H5qD714qFTA" isUnique="false" association="_IDYccN5QEd2H5qD714qFTA">
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IDiNc95QEd2H5qD714qFTA" value="1"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IDiNdN5QEd2H5qD714qFTA"/>
-    </ownedEnd>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_nji3kN5QEd2H5qD714qFTA" name="CommentedElement">
-    <ownedAttribute xmi:id="_qPNzoN5QEd2H5qD714qFTA" name="comment" visibility="public" isUnique="false">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tB4vkN5QEd2H5qD714qFTA" value="1"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tBu-kN5QEd2H5qD714qFTA" value="1"/>
-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_tB4vkd5QEd2H5qD714qFTA">
-        <value xsi:nil="true"/>
-      </defaultValue>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_J6ZzAN5REd2H5qD714qFTA" name="NameInitalizerHook">
-    <generalization xmi:id="_nBrrMN5REd2H5qD714qFTA" general="_hmemwN5REd2H5qD714qFTA"/>
-    <ownedAttribute xmi:id="_QeekAN5REd2H5qD714qFTA" name="initAction" visibility="public" isUnique="false">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_did9wd5cEd2H5qD714qFTA" value="1"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_did9wN5cEd2H5qD714qFTA" value="1"/>
-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_WZkpcN5REd2H5qD714qFTA">
-        <value xsi:nil="true"/>
-      </defaultValue>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_XxMjsN5REd2H5qD714qFTA" name="A_ExtendedGenNode_NameInitializer" memberEnd="_XxMjsd5REd2H5qD714qFTA _XxVtot5REd2H5qD714qFTA">
-    <ownedEnd xmi:id="_XxVtot5REd2H5qD714qFTA" name="extendedGenNode" type="_YeINEN5PEd2H5qD714qFTA" isUnique="false" association="_XxMjsN5REd2H5qD714qFTA">
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XxVto95REd2H5qD714qFTA" value="*"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XxVtpN5REd2H5qD714qFTA"/>
-    </ownedEnd>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_hmemwN5REd2H5qD714qFTA" name="ExternalHook">
-    <generalization xmi:id="_JkuMAN5TEd2H5qD714qFTA" general="_nji3kN5QEd2H5qD714qFTA"/>
-    <ownedAttribute xmi:id="_NrW8IN5REd2H5qD714qFTA" name="classpath" visibility="public" isUnique="false">
-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eud20d5cEd2H5qD714qFTA" value="1"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eud20N5cEd2H5qD714qFTA"/>
-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_Uv7LEd5REd2H5qD714qFTA">
-        <value xsi:nil="true"/>
-      </defaultValue>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_gmqTEN5SEd2H5qD714qFTA" name="GenChildSideAffixedNode">
-    <ownedAttribute xmi:id="_R68QEd5TEd2H5qD714qFTA" name="specificLocator" type="_N3We0N5TEd2H5qD714qFTA" isUnique="false" association="_R68QEN5TEd2H5qD714qFTA">
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_R7FaAd5TEd2H5qD714qFTA" value="1"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_R7FaAN5TEd2H5qD714qFTA"/>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_N3We0N5TEd2H5qD714qFTA" name="SpecificLocator">
-    <generalization xmi:id="_RQxRsN5TEd2H5qD714qFTA" general="_hmemwN5REd2H5qD714qFTA"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Association" xmi:id="_R68QEN5TEd2H5qD714qFTA" name="A_GenChildSideAffixedNode_SpecificLocator" memberEnd="_R68QEd5TEd2H5qD714qFTA _R7FaAt5TEd2H5qD714qFTA">
-    <ownedEnd xmi:id="_R7FaAt5TEd2H5qD714qFTA" name="genChildSideAffixedNode" type="_gmqTEN5SEd2H5qD714qFTA" isUnique="false" association="_R68QEN5TEd2H5qD714qFTA">
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_R7FaA95TEd2H5qD714qFTA" value="*"/>
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_R7FaBN5TEd2H5qD714qFTA"/>
-    </ownedEnd>
-  </packagedElement>
-  <profileApplication xmi:id="_Qh1r8t5PEd2H5qD714qFTA">
-    <eAnnotations xmi:id="_Qh1r895PEd2H5qD714qFTA" source="http://www.eclipse.org/uml2/2.0.0/UML">
-      <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/schemas/Standard/1#/"/>
-    </eAnnotations>
-    <appliedProfile href="pathmap://UML_PROFILES/Standard.profile.uml#_0"/>
-  </profileApplication>
-</uml:Model>
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_Qh1r8N5PEd2H5qD714qFTA" name="PapyrusGmfgenExtension">
+  <ownedComment xmi:id="_-rSu4N5TEd2H5qD714qFTA" annotatedElement="_YeINEN5PEd2H5qD714qFTA">
+    <body>This element is always linked to a genNode (topLevel, or child)&#xD;
+Used set if an editPart is abstract.&#xD;
+SuperGenNodes is a list of all superEditPart.&#xD;
+&#xD;
+Thanks to this, it is possible to factorize code and to decrease the number of generated classes.</body>
+  </ownedComment>
+  <ownedComment xmi:id="_ngQ9QN5UEd2H5qD714qFTA" annotatedElement="_qPNzoN5QEd2H5qD714qFTA">
+    <body>All extended classes have a comment in order to describe the puprose of this extension</body>
+  </ownedComment>
+  <ownedComment xmi:id="_lxYf8N5cEd2H5qD714qFTA" annotatedElement="_hmemwN5REd2H5qD714qFTA">
+    <body>The purpose of this class is point to an external class (for example java classes).&#xD;
+the classpath is the path to the this extenal class.</body>
+  </ownedComment>
+  <ownedComment xmi:id="_N_m3YN5dEd2H5qD714qFTA" annotatedElement="_8_kJsN5PEd2H5qD714qFTA">
+    <body>This class is used to refresh the figure by taking in account a property of domain element (in the case of Ecore, it can be an Efeature or EReference)&#xD;
+The triggeringCondtion describe the needed condition to launch the action on the figure.  these two properties can be code lines.&#xD;
+&#xD;
+For instance we would like to display active class when the efeature class is &quot;active&quot;. Or display composite kind of the association when the kind of the property end is &quot;composite&quot;.</body>
+  </ownedComment>
+  <ownedComment xmi:id="_WHoR8N5eEd2H5qD714qFTA" annotatedElement="_J6ZzAN5REd2H5qD714qFTA">
+    <body>The purpose of this class is to define our own initializer.&#xD;
+For example in the case of UML, the intialize for name may be &quot;name&quot;_'number&quot;.&#xD;
+The initAction is code that call this helper use to fill static method &quot; String name_Metaclass_VisualID(Metaclass self) &quot;</body>
+  </ownedComment>
+  <ownedComment xmi:id="_jUDagN5fEd2H5qD714qFTA" annotatedElement="_N3We0N5TEd2H5qD714qFTA">
+    <body>This class is used to precise itw own locator used for the border item, like port or template.&#xD;
+&#xD;
+for example, in the case of templateSignature of ClassEditPart in the method protected boolean addFixedChild(EditPart childEditPart):&#xD;
+replacement of the general BorderItemLocator is needed in order to constrain the movement. &#xD;
+&#xD;
+if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {&#xD;
+   // BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.NORTH);&#xD;
+   BorderItemLocator locator = new TemplateClassifierBorderItemLocator(getMainFigure(), PositionConstants.NORTH);&#xD;
+   getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator);&#xD;
+   return true;&#xD;
+}</body>
+  </ownedComment>
+  <packageImport xmi:id="_Qh1r8d5PEd2H5qD714qFTA">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Class" xmi:id="_RD9hkN5PEd2H5qD714qFTA" name="GenNode"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_YeINEN5PEd2H5qD714qFTA" name="ExtendedGenNode">
+    <generalization xmi:id="_wR5u0N5QEd2H5qD714qFTA" general="_nji3kN5QEd2H5qD714qFTA"/>
+    <ownedAttribute xmi:id="_e-KyoN5PEd2H5qD714qFTA" name="genNode" type="_RD9hkN5PEd2H5qD714qFTA" isUnique="false" association="_e-BosN5PEd2H5qD714qFTA">
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_e-Ujod5PEd2H5qD714qFTA" value="1"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_e-UjoN5PEd2H5qD714qFTA" value="1"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:id="_id1-gN5PEd2H5qD714qFTA" name="isAbstract" visibility="public" isUnique="false">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p9N6Id5PEd2H5qD714qFTA" value="1"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p9N6IN5PEd2H5qD714qFTA" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_p9N6It5PEd2H5qD714qFTA">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:id="_wg_wMd5PEd2H5qD714qFTA" name="superGenNodes" type="_RD9hkN5PEd2H5qD714qFTA" isUnique="false" association="_wg_wMN5PEd2H5qD714qFTA">
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wg_wM95PEd2H5qD714qFTA" value="*"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wg_wMt5PEd2H5qD714qFTA"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:id="_IDYccd5QEd2H5qD714qFTA" name="propRefreshHook" type="_8_kJsN5PEd2H5qD714qFTA" isUnique="false" aggregation="composite" association="_IDYccN5QEd2H5qD714qFTA">
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IDiNcd5QEd2H5qD714qFTA" value="1"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IDiNcN5QEd2H5qD714qFTA"/>
+    </ownedAttribute>
+    <ownedAttribute xmi:id="_Cj0nAN5REd2H5qD714qFTA" name="intialilization" isUnique="false"/>
+    <ownedAttribute xmi:id="_XxMjsd5REd2H5qD714qFTA" name="nameInitHook" type="_J6ZzAN5REd2H5qD714qFTA" isUnique="false" association="_XxMjsN5REd2H5qD714qFTA">
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XxVtod5REd2H5qD714qFTA" value="1"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XxVtoN5REd2H5qD714qFTA"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_e-BosN5PEd2H5qD714qFTA" name="A_ExtendedGenNode_GenNode" memberEnd="_e-KyoN5PEd2H5qD714qFTA _e-Ujot5PEd2H5qD714qFTA">
+    <ownedEnd xmi:id="_e-Ujot5PEd2H5qD714qFTA" name="extendedGenNode" type="_YeINEN5PEd2H5qD714qFTA" isUnique="false" association="_e-BosN5PEd2H5qD714qFTA">
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_e-Ujo95PEd2H5qD714qFTA" value="*"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_e-UjpN5PEd2H5qD714qFTA"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_wg_wMN5PEd2H5qD714qFTA" name="A_ExtendedGenNode_GenNode" memberEnd="_wg_wMd5PEd2H5qD714qFTA _wg_wNN5PEd2H5qD714qFTA">
+    <ownedEnd xmi:id="_wg_wNN5PEd2H5qD714qFTA" name="extendedGenNode" type="_YeINEN5PEd2H5qD714qFTA" isUnique="false" association="_wg_wMN5PEd2H5qD714qFTA">
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wg_wNd5PEd2H5qD714qFTA" value="*"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_whJhMN5PEd2H5qD714qFTA"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_8_kJsN5PEd2H5qD714qFTA" name="PropertyRefreshHook">
+    <generalization xmi:id="_mX9YwN5REd2H5qD714qFTA" general="_hmemwN5REd2H5qD714qFTA"/>
+    <ownedAttribute xmi:id="_0KMK0N5XEd2H5qD714qFTA" name="triggeringCondition" visibility="public" isUnique="false">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5N2R8d5XEd2H5qD714qFTA" value="1"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5N2R8N5XEd2H5qD714qFTA" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_5N2R8t5XEd2H5qD714qFTA">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+    <ownedAttribute xmi:id="_mET_0N5YEd2H5qD714qFTA" name="action" visibility="public" isUnique="false">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qv_EwN5YEd2H5qD714qFTA" value="1"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qv1TwN5YEd2H5qD714qFTA" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_qv_Ewd5YEd2H5qD714qFTA">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_IDYccN5QEd2H5qD714qFTA" name="A_ExtendedGenNode_FeatureBehaviour" memberEnd="_IDYccd5QEd2H5qD714qFTA _IDiNct5QEd2H5qD714qFTA">
+    <ownedEnd xmi:id="_IDiNct5QEd2H5qD714qFTA" name="extendedGenNode" type="_YeINEN5PEd2H5qD714qFTA" isUnique="false" association="_IDYccN5QEd2H5qD714qFTA">
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IDiNc95QEd2H5qD714qFTA" value="1"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IDiNdN5QEd2H5qD714qFTA"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_nji3kN5QEd2H5qD714qFTA" name="CommentedElement">
+    <ownedAttribute xmi:id="_qPNzoN5QEd2H5qD714qFTA" name="comment" visibility="public" isUnique="false">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tB4vkN5QEd2H5qD714qFTA" value="1"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tBu-kN5QEd2H5qD714qFTA" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_tB4vkd5QEd2H5qD714qFTA">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_J6ZzAN5REd2H5qD714qFTA" name="NameInitalizerHook">
+    <generalization xmi:id="_nBrrMN5REd2H5qD714qFTA" general="_hmemwN5REd2H5qD714qFTA"/>
+    <ownedAttribute xmi:id="_QeekAN5REd2H5qD714qFTA" name="initAction" visibility="public" isUnique="false">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_did9wd5cEd2H5qD714qFTA" value="1"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_did9wN5cEd2H5qD714qFTA" value="1"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_WZkpcN5REd2H5qD714qFTA">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_XxMjsN5REd2H5qD714qFTA" name="A_ExtendedGenNode_NameInitializer" memberEnd="_XxMjsd5REd2H5qD714qFTA _XxVtot5REd2H5qD714qFTA">
+    <ownedEnd xmi:id="_XxVtot5REd2H5qD714qFTA" name="extendedGenNode" type="_YeINEN5PEd2H5qD714qFTA" isUnique="false" association="_XxMjsN5REd2H5qD714qFTA">
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XxVto95REd2H5qD714qFTA" value="*"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XxVtpN5REd2H5qD714qFTA"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_hmemwN5REd2H5qD714qFTA" name="ExternalHook">
+    <generalization xmi:id="_JkuMAN5TEd2H5qD714qFTA" general="_nji3kN5QEd2H5qD714qFTA"/>
+    <ownedAttribute xmi:id="_NrW8IN5REd2H5qD714qFTA" name="classpath" visibility="public" isUnique="false">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eud20d5cEd2H5qD714qFTA" value="1"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eud20N5cEd2H5qD714qFTA"/>
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_Uv7LEd5REd2H5qD714qFTA">
+        <value xsi:nil="true"/>
+      </defaultValue>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_gmqTEN5SEd2H5qD714qFTA" name="GenChildSideAffixedNode">
+    <ownedAttribute xmi:id="_R68QEd5TEd2H5qD714qFTA" name="specificLocator" type="_N3We0N5TEd2H5qD714qFTA" isUnique="false" association="_R68QEN5TEd2H5qD714qFTA">
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_R7FaAd5TEd2H5qD714qFTA" value="1"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_R7FaAN5TEd2H5qD714qFTA"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_N3We0N5TEd2H5qD714qFTA" name="SpecificLocator">
+    <generalization xmi:id="_RQxRsN5TEd2H5qD714qFTA" general="_hmemwN5REd2H5qD714qFTA"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_R68QEN5TEd2H5qD714qFTA" name="A_GenChildSideAffixedNode_SpecificLocator" memberEnd="_R68QEd5TEd2H5qD714qFTA _R7FaAt5TEd2H5qD714qFTA">
+    <ownedEnd xmi:id="_R7FaAt5TEd2H5qD714qFTA" name="genChildSideAffixedNode" type="_gmqTEN5SEd2H5qD714qFTA" isUnique="false" association="_R68QEN5TEd2H5qD714qFTA">
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_R7FaA95TEd2H5qD714qFTA" value="*"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_R7FaBN5TEd2H5qD714qFTA"/>
+    </ownedEnd>
+  </packagedElement>
+  <profileApplication xmi:id="_Qh1r8t5PEd2H5qD714qFTA">
+    <eAnnotations xmi:id="_Qh1r895PEd2H5qD714qFTA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+      <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/schemas/Standard/1#/"/>
+    </eAnnotations>
+    <appliedProfile href="pathmap://UML_PROFILES/Standard.profile.uml#_0"/>
+  </profileApplication>
+</uml:Model>
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/model/papyrusGmfgenExtension.ecore b/plugins/developer/org.eclipse.papyrus.gmfgenextension/model/papyrusGmfgenExtension.ecore
index cbda163061c..7fd23e8fef4 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/model/papyrusGmfgenExtension.ecore
+++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/model/papyrusGmfgenExtension.ecore
@@ -1,202 +1,202 @@
-<?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="papyrusgmfgenextension" nsURI="http://www.eclipse.org/papyrus/2009/papyrusgmfgenextension"
-    nsPrefix="papyrusgmfgenextension">
-  <eClassifiers xsi:type="ecore:EClass" name="ExtendedGenView" eSuperTypes="#//CommentedElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This element is always linked to a genView (topLevel, or child)&#xD;&#xA;Used set if an editPart is abstract.&#xD;&#xA;SuperGenViews is a list of all superEditPart.&#xD;&#xA;&#xD;&#xA;Thanks to this, it is possible to factorize code and to decrease the number of generated classes."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="genView" ordered="false"
-        unique="false" lowerBound="1" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenCommonBase"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isAbstract" ordered="false"
-        unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="superGenViews" ordered="false"
-        unique="false" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenCommonBase"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="propRefreshHook" ordered="false"
-        unique="false" eType="#//PropertyRefreshHook" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="superOwnedEditPart" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CommentedElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="comment" ordered="false"
-        unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="All extended classes have a comment in order to describe the puprose of this extension"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PropertyRefreshHook" eSuperTypes="#//ExternalHook">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class is used to refresh the figure by taking in account a property of domain element (in the case of Ecore, it can be an Efeature or EReference)&#xD;&#xA;The triggeringCondtion describe the needed condition to launch the action on the figure.  these two properties can be code lines.&#xD;&#xA;&#xD;&#xA;For instance we would like to display active class when the efeature class is &quot;active&quot;. Or display composite kind of the association when the kind of the property end is &quot;composite&quot;."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="triggeringCondition" ordered="false"
-        unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="action" ordered="false"
-        unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExternalHook" eSuperTypes="#//CommentedElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The purpose of this class is point to an external class (for example java classes).&#xD;&#xA;the classpath is the path to the this extenal class."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="classpath" ordered="false"
-        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SpecificLocator" eSuperTypes="#//ExternalHook">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class is used to precise itw own locator used for the border item, like port or template.&#xD;&#xA;&#xD;&#xA;for example, in the case of templateSignature of ClassEditPart in the method protected boolean addFixedChild(EditPart childEditPart):&#xD;&#xA;replacement of the general BorderItemLocator is needed in order to constrain the movement. &#xD;&#xA;&#xD;&#xA;if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {&#xD;&#xA;   // BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.NORTH);&#xD;&#xA;   BorderItemLocator locator = new TemplateClassifierBorderItemLocator(getMainFigure(), PositionConstants.NORTH);&#xD;&#xA;   getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator);&#xD;&#xA;   return true;&#xD;&#xA;}"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="genChildSideAffixedNode"
-        upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenChildSideAffixedNode"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PapyrusExtensionRootNode" eSuperTypes="#//CommentedElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="extensionNodes" upperBound="-1"
-        eType="#//CommentedElement" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AlternateCanvas" eSuperTypes="#//CommentedElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="domainDiagramElement" lowerBound="1"
-        eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="alternateTopLevelNodes"
-        upperBound="-1" eType="#//AlternateGenTopLevelNode" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="alternateLinkNodes" upperBound="-1"
-        eType="#//AlternateGenLink" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagram" lowerBound="1"
-        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenDiagram"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AlternateGenTopLevelNode" eSuperTypes="#//CommentedElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="genTopLevelNode" lowerBound="1"
-        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenTopLevelNode"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="typeModelFacet" lowerBound="1"
-        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//TypeModelFacet"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AlternateGenLink" eSuperTypes="#//CommentedElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="genLinkNode" lowerBound="1"
-        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenLink"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="typeModelFacet" lowerBound="1"
-        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//TypeModelFacet"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MutatingCanvas" eSuperTypes="#//CommentedElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="alternateCanvases" upperBound="-1"
-        eType="#//AlternateCanvas" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OwnedEditpart" eSuperTypes="#//ExternalHook">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SpecificDiagramUpdater" eSuperTypes="#//ExternalHook">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class is used to precise itw own locator used for the border item, like port or template.&#xD;&#xA;&#xD;&#xA;for example, in the case of templateSignature of ClassEditPart in the method protected boolean addFixedChild(EditPart childEditPart):&#xD;&#xA;replacement of the general BorderItemLocator is needed in order to constrain the movement. &#xD;&#xA;&#xD;&#xA;if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {&#xD;&#xA;   // BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.NORTH);&#xD;&#xA;   BorderItemLocator locator = new TemplateClassifierBorderItemLocator(getMainFigure(), PositionConstants.NORTH);&#xD;&#xA;   getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator);&#xD;&#xA;   return true;&#xD;&#xA;}"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="genNode" eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenCommonBase"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GenNodeConstraint" eSuperTypes="#//CommentedElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="genNode" upperBound="-1"
-        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenNode"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="genConstraint" eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenConstraint"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SpecificLocatorExternalLabel" eSuperTypes="#//ExternalHook">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This class is used to precise itw own locator used for the border item, like port or template.&#xD;&#xA;&#xD;&#xA;for example, in the case of templateSignature of ClassEditPart in the method protected boolean addFixedChild(EditPart childEditPart):&#xD;&#xA;replacement of the general BorderItemLocator is needed in order to constrain the movement. &#xD;&#xA;&#xD;&#xA;if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {&#xD;&#xA;   // BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.NORTH);&#xD;&#xA;   BorderItemLocator locator = new TemplateClassifierBorderItemLocator(getMainFigure(), PositionConstants.NORTH);&#xD;&#xA;   getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator);&#xD;&#xA;   return true;&#xD;&#xA;}"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="genExternalNodeLabel" upperBound="-1"
-        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenExternalNodeLabel"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AdditionalEditPartCandies" eSuperTypes="#//CommentedElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="baseEditHelperPackage"
-        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EditPartUsingDeleteService" eSuperTypes="#//CommentedElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This element is always linked to a genView (topLevel, or child)&#xD;&#xA;Used set if an editPart is abstract.&#xD;&#xA;SuperGenViews is a list of all superEditPart.&#xD;&#xA;&#xD;&#xA;Thanks to this, it is possible to factorize code and to decrease the number of generated classes."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="genView" ordered="false"
-        unique="false" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenCommonBase"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EditPartUsingReorientService" eSuperTypes="#//CommentedElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This element is always linked to a genView (topLevel, or child)&#xD;&#xA;Used set if an editPart is abstract.&#xD;&#xA;SuperGenViews is a list of all superEditPart.&#xD;&#xA;&#xD;&#xA;Thanks to this, it is possible to factorize code and to decrease the number of generated classes."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="genView" ordered="false"
-        unique="false" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenLink"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LabelVisibilityPreference" eSuperTypes="#//CommentedElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This element is always linked with link Label and External Node Label.&#xD;&#xA;role : the role of the Label (Stereotype, Source Multiplicity, Target Multiplicity, Name, ...)&#xD;&#xA;iconPath : an icon illustrating the role of the Label&#xD;&#xA;visibleByDefault : if false, the label is not visible when the element is created&#xD;&#xA;&#xD;&#xA;These informations are used by the action Show/Hide Label."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="role" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPathRole" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="linkLabels" upperBound="-1"
-        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenLinkLabel"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="externalNodeLabels" upperBound="-1"
-        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenExternalNodeLabel"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="visibleByDefault" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CompartmentVisibilityPreference" eSuperTypes="#//CommentedElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This element allows to define the compartments which are hidden (or visible) by default"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="visibleByDefault" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="compartments" upperBound="-1"
-        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenCompartment"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CompartmentTitleVisibilityPreference"
-      eSuperTypes="#//CommentedElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This element allows to define the compartment's title which are hidden (or visible) by default"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="visibleByDefault" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="compartments" upperBound="-1"
-        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenCompartment"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ConstrainedByReferenceCompartmentItemSemanticEditPolicy"
-      eSuperTypes="#//CommentedElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="Documentation" value="Add constraint on Compartment Item Semantic Policy in order to prevent move into compartment of elements which can be contained. This constraint used the child node define in the GMF Model in order to define the correspoding EReference. When a move is executed the item semantic policy will fisrt check that the element can be conatined/referenced by this EReference?"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="genView" upperBound="-1"
-        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenCommonBase"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GenerateUsingElementTypeCreationCommand"
-      eSuperTypes="#//CommentedElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="Documentation" value="flag that indicated if the code generation should rely on the creation command generated by gmf tooling of the creation commands based on UML.edit framework"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomDiagramUpdaterSingleton" eSuperTypes="#//CommentedElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="Documentation" value="This object is used to register the diagram updater instance to use in the code. &#xD;&#xA;The class must extends the generated diagram updater.&#xD;&#xA;&#xD;&#xA;"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="singletonPath" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SpecificNodePlate" eSuperTypes="#//CommentedElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This element is always linked to a genView (topLevel, or child)&#xD;&#xA;Used set if an editPart is abstract.&#xD;&#xA;SuperGenViews is a list of all superEditPart.&#xD;&#xA;&#xD;&#xA;Thanks to this, it is possible to factorize code and to decrease the number of generated classes."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="editParts" ordered="false"
-        unique="false" lowerBound="1" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenNode"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nodePlateQualifiedName"
-        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GenVisualTypeProvider" eSuperTypes="#//CommentedElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Configuration of this diagram's provider to the Visual Type Service,&#xA;which enables canonical view synchronization, drag-and-drop, and&#xA;possibly other capabilities."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        defaultValueLiteral="UMLVisualTypeProvider"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="VisualIDOverride">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="genView" ordered="false"
-        unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenCommonBase"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="visualID" lowerBound="1"
-        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="child" upperBound="-1"
-        eType="#//VisualIDOverride" containment="true"/>
-  </eClassifiers>
-</ecore:EPackage>
+<?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="papyrusgmfgenextension" nsURI="http://www.eclipse.org/papyrus/2009/papyrusgmfgenextension"
+    nsPrefix="papyrusgmfgenextension">
+  <eClassifiers xsi:type="ecore:EClass" name="ExtendedGenView" eSuperTypes="#//CommentedElement">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="This element is always linked to a genView (topLevel, or child)&#xD;&#xA;Used set if an editPart is abstract.&#xD;&#xA;SuperGenViews is a list of all superEditPart.&#xD;&#xA;&#xD;&#xA;Thanks to this, it is possible to factorize code and to decrease the number of generated classes."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="genView" ordered="false"
+        unique="false" lowerBound="1" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenCommonBase"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isAbstract" ordered="false"
+        unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="superGenViews" ordered="false"
+        unique="false" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenCommonBase"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="propRefreshHook" ordered="false"
+        unique="false" eType="#//PropertyRefreshHook" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="superOwnedEditPart" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CommentedElement">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="comment" ordered="false"
+        unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="All extended classes have a comment in order to describe the puprose of this extension"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="PropertyRefreshHook" eSuperTypes="#//ExternalHook">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="This class is used to refresh the figure by taking in account a property of domain element (in the case of Ecore, it can be an Efeature or EReference)&#xD;&#xA;The triggeringCondtion describe the needed condition to launch the action on the figure.  these two properties can be code lines.&#xD;&#xA;&#xD;&#xA;For instance we would like to display active class when the efeature class is &quot;active&quot;. Or display composite kind of the association when the kind of the property end is &quot;composite&quot;."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="triggeringCondition" ordered="false"
+        unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="action" ordered="false"
+        unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ExternalHook" eSuperTypes="#//CommentedElement">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="The purpose of this class is point to an external class (for example java classes).&#xD;&#xA;the classpath is the path to the this extenal class."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="classpath" ordered="false"
+        unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="SpecificLocator" eSuperTypes="#//ExternalHook">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="This class is used to precise itw own locator used for the border item, like port or template.&#xD;&#xA;&#xD;&#xA;for example, in the case of templateSignature of ClassEditPart in the method protected boolean addFixedChild(EditPart childEditPart):&#xD;&#xA;replacement of the general BorderItemLocator is needed in order to constrain the movement. &#xD;&#xA;&#xD;&#xA;if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {&#xD;&#xA;   // BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.NORTH);&#xD;&#xA;   BorderItemLocator locator = new TemplateClassifierBorderItemLocator(getMainFigure(), PositionConstants.NORTH);&#xD;&#xA;   getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator);&#xD;&#xA;   return true;&#xD;&#xA;}"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="genChildSideAffixedNode"
+        upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenChildSideAffixedNode"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="PapyrusExtensionRootNode" eSuperTypes="#//CommentedElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="extensionNodes" upperBound="-1"
+        eType="#//CommentedElement" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AlternateCanvas" eSuperTypes="#//CommentedElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="domainDiagramElement" lowerBound="1"
+        eType="ecore:EClass platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.ecore#//GenClass"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="alternateTopLevelNodes"
+        upperBound="-1" eType="#//AlternateGenTopLevelNode" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="alternateLinkNodes" upperBound="-1"
+        eType="#//AlternateGenLink" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="diagram" lowerBound="1"
+        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenDiagram"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AlternateGenTopLevelNode" eSuperTypes="#//CommentedElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="genTopLevelNode" lowerBound="1"
+        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenTopLevelNode"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="typeModelFacet" lowerBound="1"
+        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//TypeModelFacet"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AlternateGenLink" eSuperTypes="#//CommentedElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="genLinkNode" lowerBound="1"
+        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenLink"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="typeModelFacet" lowerBound="1"
+        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//TypeModelFacet"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="MutatingCanvas" eSuperTypes="#//CommentedElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="alternateCanvases" upperBound="-1"
+        eType="#//AlternateCanvas" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="OwnedEditpart" eSuperTypes="#//ExternalHook">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="SpecificDiagramUpdater" eSuperTypes="#//ExternalHook">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="This class is used to precise itw own locator used for the border item, like port or template.&#xD;&#xA;&#xD;&#xA;for example, in the case of templateSignature of ClassEditPart in the method protected boolean addFixedChild(EditPart childEditPart):&#xD;&#xA;replacement of the general BorderItemLocator is needed in order to constrain the movement. &#xD;&#xA;&#xD;&#xA;if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {&#xD;&#xA;   // BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.NORTH);&#xD;&#xA;   BorderItemLocator locator = new TemplateClassifierBorderItemLocator(getMainFigure(), PositionConstants.NORTH);&#xD;&#xA;   getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator);&#xD;&#xA;   return true;&#xD;&#xA;}"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="genNode" eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenCommonBase"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="GenNodeConstraint" eSuperTypes="#//CommentedElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="genNode" upperBound="-1"
+        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenNode"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="genConstraint" eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenConstraint"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="SpecificLocatorExternalLabel" eSuperTypes="#//ExternalHook">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="This class is used to precise itw own locator used for the border item, like port or template.&#xD;&#xA;&#xD;&#xA;for example, in the case of templateSignature of ClassEditPart in the method protected boolean addFixedChild(EditPart childEditPart):&#xD;&#xA;replacement of the general BorderItemLocator is needed in order to constrain the movement. &#xD;&#xA;&#xD;&#xA;if (childEditPart instanceof RedefinableTemplateSignatureEditPart) {&#xD;&#xA;   // BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.NORTH);&#xD;&#xA;   BorderItemLocator locator = new TemplateClassifierBorderItemLocator(getMainFigure(), PositionConstants.NORTH);&#xD;&#xA;   getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator);&#xD;&#xA;   return true;&#xD;&#xA;}"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="genExternalNodeLabel" upperBound="-1"
+        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenExternalNodeLabel"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AdditionalEditPartCandies" eSuperTypes="#//CommentedElement">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="baseEditHelperPackage"
+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="EditPartUsingDeleteService" eSuperTypes="#//CommentedElement">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="This element is always linked to a genView (topLevel, or child)&#xD;&#xA;Used set if an editPart is abstract.&#xD;&#xA;SuperGenViews is a list of all superEditPart.&#xD;&#xA;&#xD;&#xA;Thanks to this, it is possible to factorize code and to decrease the number of generated classes."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="genView" ordered="false"
+        unique="false" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenCommonBase"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="EditPartUsingReorientService" eSuperTypes="#//CommentedElement">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="This element is always linked to a genView (topLevel, or child)&#xD;&#xA;Used set if an editPart is abstract.&#xD;&#xA;SuperGenViews is a list of all superEditPart.&#xD;&#xA;&#xD;&#xA;Thanks to this, it is possible to factorize code and to decrease the number of generated classes."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="genView" ordered="false"
+        unique="false" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenLink"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="LabelVisibilityPreference" eSuperTypes="#//CommentedElement">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="This element is always linked with link Label and External Node Label.&#xD;&#xA;role : the role of the Label (Stereotype, Source Multiplicity, Target Multiplicity, Name, ...)&#xD;&#xA;iconPath : an icon illustrating the role of the Label&#xD;&#xA;visibleByDefault : if false, the label is not visible when the element is created&#xD;&#xA;&#xD;&#xA;These informations are used by the action Show/Hide Label."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="role" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPathRole" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="linkLabels" upperBound="-1"
+        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenLinkLabel"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="externalNodeLabels" upperBound="-1"
+        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenExternalNodeLabel"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="visibleByDefault" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
+        defaultValueLiteral="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CompartmentVisibilityPreference" eSuperTypes="#//CommentedElement">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="This element allows to define the compartments which are hidden (or visible) by default"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="visibleByDefault" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
+        defaultValueLiteral="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="compartments" upperBound="-1"
+        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenCompartment"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CompartmentTitleVisibilityPreference"
+      eSuperTypes="#//CommentedElement">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="This element allows to define the compartment's title which are hidden (or visible) by default"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="visibleByDefault" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
+        defaultValueLiteral="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="compartments" upperBound="-1"
+        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenCompartment"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ConstrainedByReferenceCompartmentItemSemanticEditPolicy"
+      eSuperTypes="#//CommentedElement">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="Documentation" value="Add constraint on Compartment Item Semantic Policy in order to prevent move into compartment of elements which can be contained. This constraint used the child node define in the GMF Model in order to define the correspoding EReference. When a move is executed the item semantic policy will fisrt check that the element can be conatined/referenced by this EReference?"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="genView" upperBound="-1"
+        eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenCommonBase"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="GenerateUsingElementTypeCreationCommand"
+      eSuperTypes="#//CommentedElement">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="Documentation" value="flag that indicated if the code generation should rely on the creation command generated by gmf tooling of the creation commands based on UML.edit framework"/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CustomDiagramUpdaterSingleton" eSuperTypes="#//CommentedElement">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="Documentation" value="This object is used to register the diagram updater instance to use in the code. &#xD;&#xA;The class must extends the generated diagram updater.&#xD;&#xA;&#xD;&#xA;"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="singletonPath" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="SpecificNodePlate" eSuperTypes="#//CommentedElement">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="This element is always linked to a genView (topLevel, or child)&#xD;&#xA;Used set if an editPart is abstract.&#xD;&#xA;SuperGenViews is a list of all superEditPart.&#xD;&#xA;&#xD;&#xA;Thanks to this, it is possible to factorize code and to decrease the number of generated classes."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="editParts" ordered="false"
+        unique="false" lowerBound="1" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenNode"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nodePlateQualifiedName"
+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="GenVisualTypeProvider" eSuperTypes="#//CommentedElement">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Configuration of this diagram's provider to the Visual Type Service,&#xA;which enables canonical view synchronization, drag-and-drop, and&#xA;possibly other capabilities."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        defaultValueLiteral="UMLVisualTypeProvider"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="VisualIDOverride">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="genView" ordered="false"
+        unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenCommonBase"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="visualID" lowerBound="1"
+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="child" upperBound="-1"
+        eType="#//VisualIDOverride" containment="true"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/model/papyrusGmfgenExtension.genmodel b/plugins/developer/org.eclipse.papyrus.gmfgenextension/model/papyrusGmfgenExtension.genmodel
index 1b8b62cfd57..570c095dbcf 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/model/papyrusGmfgenExtension.genmodel
+++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/model/papyrusGmfgenExtension.genmodel
@@ -1,111 +1,111 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2015 CEA LIST and others.&#xA;&#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;  CEA LIST - Initial API and implementation&#xA;"
-    modelDirectory="/org.eclipse.papyrus.gmfgenextension/src" modelPluginID="org.eclipse.papyrus.gmfgenextension"
-    modelName="PapyrusGmfgenExtension" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="8.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel#//genmodel platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.genmodel#//gmfgen">
-  <foreignModel>papyrusGmfgenExtension.ecore</foreignModel>
-  <genPackages prefix="Papyrusgmfgenextension" basePackage="org.eclipse.papyrus" disposableProviderFactory="true"
-      ecorePackage="papyrusGmfgenExtension.ecore#/">
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//ExtendedGenView">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//ExtendedGenView/genView"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//ExtendedGenView/isAbstract"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//ExtendedGenView/superGenViews"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//ExtendedGenView/propRefreshHook"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//ExtendedGenView/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//ExtendedGenView/superOwnedEditPart"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="papyrusGmfgenExtension.ecore#//CommentedElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//CommentedElement/comment"/>
-    </genClasses>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//PropertyRefreshHook">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//PropertyRefreshHook/triggeringCondition"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//PropertyRefreshHook/action"/>
-    </genClasses>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//ExternalHook">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//ExternalHook/classpath"/>
-    </genClasses>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//SpecificLocator">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//SpecificLocator/genChildSideAffixedNode"/>
-    </genClasses>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//PapyrusExtensionRootNode">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//PapyrusExtensionRootNode/extensionNodes"/>
-    </genClasses>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//AlternateCanvas">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//AlternateCanvas/domainDiagramElement"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//AlternateCanvas/alternateTopLevelNodes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//AlternateCanvas/alternateLinkNodes"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//AlternateCanvas/diagram"/>
-    </genClasses>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//AlternateGenTopLevelNode">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//AlternateGenTopLevelNode/genTopLevelNode"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//AlternateGenTopLevelNode/typeModelFacet"/>
-    </genClasses>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//AlternateGenLink">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//AlternateGenLink/genLinkNode"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//AlternateGenLink/typeModelFacet"/>
-    </genClasses>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//MutatingCanvas">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//MutatingCanvas/alternateCanvases"/>
-    </genClasses>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//OwnedEditpart">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//OwnedEditpart/name"/>
-    </genClasses>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//SpecificDiagramUpdater">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//SpecificDiagramUpdater/genNode"/>
-    </genClasses>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//GenNodeConstraint">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//GenNodeConstraint/genNode"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//GenNodeConstraint/genConstraint"/>
-    </genClasses>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//SpecificLocatorExternalLabel">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//SpecificLocatorExternalLabel/genExternalNodeLabel"/>
-    </genClasses>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//AdditionalEditPartCandies">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//AdditionalEditPartCandies/baseEditHelperPackage"/>
-    </genClasses>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//EditPartUsingDeleteService">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//EditPartUsingDeleteService/name"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//EditPartUsingDeleteService/genView"/>
-    </genClasses>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//EditPartUsingReorientService">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//EditPartUsingReorientService/name"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//EditPartUsingReorientService/genView"/>
-    </genClasses>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//LabelVisibilityPreference">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//LabelVisibilityPreference/role"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//LabelVisibilityPreference/iconPathRole"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//LabelVisibilityPreference/linkLabels"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//LabelVisibilityPreference/externalNodeLabels"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//LabelVisibilityPreference/visibleByDefault"/>
-    </genClasses>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//CompartmentVisibilityPreference">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//CompartmentVisibilityPreference/visibleByDefault"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//CompartmentVisibilityPreference/compartments"/>
-    </genClasses>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//CompartmentTitleVisibilityPreference">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//CompartmentTitleVisibilityPreference/visibleByDefault"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//CompartmentTitleVisibilityPreference/compartments"/>
-    </genClasses>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//ConstrainedByReferenceCompartmentItemSemanticEditPolicy">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//ConstrainedByReferenceCompartmentItemSemanticEditPolicy/genView"/>
-    </genClasses>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//GenerateUsingElementTypeCreationCommand"/>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//CustomDiagramUpdaterSingleton">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//CustomDiagramUpdaterSingleton/singletonPath"/>
-    </genClasses>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//SpecificNodePlate">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//SpecificNodePlate/editParts"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//SpecificNodePlate/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//SpecificNodePlate/nodePlateQualifiedName"/>
-    </genClasses>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//GenVisualTypeProvider">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//GenVisualTypeProvider/className"/>
-    </genClasses>
-    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//VisualIDOverride">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//VisualIDOverride/genView"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//VisualIDOverride/visualID"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//VisualIDOverride/child"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2015 CEA LIST and others.&#xA;&#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;  CEA LIST - Initial API and implementation&#xA;"
+    modelDirectory="/org.eclipse.papyrus.gmfgenextension/src" modelPluginID="org.eclipse.papyrus.gmfgenextension"
+    modelName="PapyrusGmfgenExtension" importerID="org.eclipse.emf.importer.ecore"
+    complianceLevel="8.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel#//genmodel platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.genmodel#//gmfgen">
+  <foreignModel>papyrusGmfgenExtension.ecore</foreignModel>
+  <genPackages prefix="Papyrusgmfgenextension" basePackage="org.eclipse.papyrus" disposableProviderFactory="true"
+      ecorePackage="papyrusGmfgenExtension.ecore#/">
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//ExtendedGenView">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//ExtendedGenView/genView"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//ExtendedGenView/isAbstract"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//ExtendedGenView/superGenViews"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//ExtendedGenView/propRefreshHook"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//ExtendedGenView/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//ExtendedGenView/superOwnedEditPart"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="papyrusGmfgenExtension.ecore#//CommentedElement">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//CommentedElement/comment"/>
+    </genClasses>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//PropertyRefreshHook">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//PropertyRefreshHook/triggeringCondition"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//PropertyRefreshHook/action"/>
+    </genClasses>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//ExternalHook">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//ExternalHook/classpath"/>
+    </genClasses>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//SpecificLocator">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//SpecificLocator/genChildSideAffixedNode"/>
+    </genClasses>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//PapyrusExtensionRootNode">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//PapyrusExtensionRootNode/extensionNodes"/>
+    </genClasses>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//AlternateCanvas">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//AlternateCanvas/domainDiagramElement"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//AlternateCanvas/alternateTopLevelNodes"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//AlternateCanvas/alternateLinkNodes"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//AlternateCanvas/diagram"/>
+    </genClasses>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//AlternateGenTopLevelNode">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//AlternateGenTopLevelNode/genTopLevelNode"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//AlternateGenTopLevelNode/typeModelFacet"/>
+    </genClasses>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//AlternateGenLink">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//AlternateGenLink/genLinkNode"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//AlternateGenLink/typeModelFacet"/>
+    </genClasses>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//MutatingCanvas">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//MutatingCanvas/alternateCanvases"/>
+    </genClasses>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//OwnedEditpart">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//OwnedEditpart/name"/>
+    </genClasses>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//SpecificDiagramUpdater">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//SpecificDiagramUpdater/genNode"/>
+    </genClasses>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//GenNodeConstraint">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//GenNodeConstraint/genNode"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//GenNodeConstraint/genConstraint"/>
+    </genClasses>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//SpecificLocatorExternalLabel">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//SpecificLocatorExternalLabel/genExternalNodeLabel"/>
+    </genClasses>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//AdditionalEditPartCandies">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//AdditionalEditPartCandies/baseEditHelperPackage"/>
+    </genClasses>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//EditPartUsingDeleteService">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//EditPartUsingDeleteService/name"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//EditPartUsingDeleteService/genView"/>
+    </genClasses>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//EditPartUsingReorientService">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//EditPartUsingReorientService/name"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//EditPartUsingReorientService/genView"/>
+    </genClasses>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//LabelVisibilityPreference">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//LabelVisibilityPreference/role"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//LabelVisibilityPreference/iconPathRole"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//LabelVisibilityPreference/linkLabels"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//LabelVisibilityPreference/externalNodeLabels"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//LabelVisibilityPreference/visibleByDefault"/>
+    </genClasses>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//CompartmentVisibilityPreference">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//CompartmentVisibilityPreference/visibleByDefault"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//CompartmentVisibilityPreference/compartments"/>
+    </genClasses>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//CompartmentTitleVisibilityPreference">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//CompartmentTitleVisibilityPreference/visibleByDefault"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//CompartmentTitleVisibilityPreference/compartments"/>
+    </genClasses>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//ConstrainedByReferenceCompartmentItemSemanticEditPolicy">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//ConstrainedByReferenceCompartmentItemSemanticEditPolicy/genView"/>
+    </genClasses>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//GenerateUsingElementTypeCreationCommand"/>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//CustomDiagramUpdaterSingleton">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//CustomDiagramUpdaterSingleton/singletonPath"/>
+    </genClasses>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//SpecificNodePlate">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//SpecificNodePlate/editParts"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//SpecificNodePlate/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//SpecificNodePlate/nodePlateQualifiedName"/>
+    </genClasses>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//GenVisualTypeProvider">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//GenVisualTypeProvider/className"/>
+    </genClasses>
+    <genClasses ecoreClass="papyrusGmfgenExtension.ecore#//VisualIDOverride">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//VisualIDOverride/genView"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrusGmfgenExtension.ecore#//VisualIDOverride/visualID"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference papyrusGmfgenExtension.ecore#//VisualIDOverride/child"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/plugin.properties b/plugins/developer/org.eclipse.papyrus.gmfgenextension/plugin.properties
index abfb9f2571b..3cb5c9b9859 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/plugin.properties
+++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/plugin.properties
@@ -1,12 +1,12 @@
-#################################################################################
-# Copyright (c) 2010 CEA LIST.
-# 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:
-#       Patrick Tessier patrick.tessier@cea.fr - Initial API and implementation
-##################################################################################
-pluginName = Papyrus Extensions to the GMFGen Model Plugin
-providerName=Eclipse Modeling Project
+#################################################################################
+# Copyright (c) 2010 CEA LIST.
+# 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:
+#       Patrick Tessier patrick.tessier@cea.fr - Initial API and implementation
+##################################################################################
+pluginName = Papyrus Extensions to the GMFGen Model Plugin
+providerName=Eclipse Modeling Project
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/plugin.xml b/plugins/developer/org.eclipse.papyrus.gmfgenextension/plugin.xml
index 8c851cfef10..62640bd7662 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/plugin.xml
+++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/plugin.xml
@@ -1,309 +1,309 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- <copyright>
- </copyright>
-
- $Id$
--->
-
-<plugin>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="http://www.eclipse.org/papyrus/2009/papyrusgmfgenextension"
-            class="org.eclipse.papyrus.papyrusgmfgenextension.PapyrusgmfgenextensionPackage"
-            genModel="model/papyrusGmfgenExtension.genmodel"/>
-   </extension>
-   <extension
-         point="org.eclipse.ui.popupMenus">
-
-            <objectContribution
-            adaptable="true"
-            id="org.eclipse.papyrus.papyrusgmfgenextension.popupactions"
-            objectClass="org.eclipse.emf.ecore.EObject">
-                    <menu
-                          icon="icons/PapyrusLogo16x16.gif"
-                          id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus"
-                          label="Papyrus GMFGen Tools"
-                          path="papyrus">
-                    </menu>
-                    <action
-                          class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddNodeQualifiedNameBehavior"
-                          enablesFor="*"
-                          id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddNodeQualifiedNameBehavior"
-                          label="Add behavior to display qualified name"
-                          menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddNodeQualifiedNameBehavior">
-                       <enablement>
-                          <objectClass
-                                name="org.eclipse.gmf.codegen.gmfgen.GenNode">
-                          </objectClass>
-                       </enablement>
-                    </action>
-                 <action
-                       class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddNodeStereotypeDisplayBehavior"
-                       enablesFor="*"
-                       id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddNodeStereotypeDisplayBehavior"
-                       label="Add behavior to display applied stereotype for a node"
-                       menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddNodeStereotypeDisplayBehavior">
-                    <enablement>
-                       <objectClass
-                             name="org.eclipse.gmf.codegen.gmfgen.GenNode">
-                       </objectClass>
-                    </enablement>
-                 </action>
-                 <action
-                       class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddNodeShowHideCompartmentBehavior"
-                       enablesFor="*"
-                       id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddNodeShowHideBehavior"
-                       label="Add behavior to show/hide compartments"
-                       menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddNodeShowHideBehavior">
-                    <enablement>
-                       <objectClass
-                             name="org.eclipse.gmf.codegen.gmfgen.GenNode">
-                       </objectClass>
-                    </enablement>
-                 </action>
-                 <action
-                       class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddNodeShowHideContentsBehavior"
-                       enablesFor="*"
-                       id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddNodeShowHideBehavior"
-                       label="Add behavior to show/hide classifiers contents"
-                       menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddNodeShowHideBehavior">
-                    <enablement>
-                       <objectClass
-                             name="org.eclipse.gmf.codegen.gmfgen.GenNode">
-                       </objectClass>
-                    </enablement>
-                 </action>
-                 <action
-                       class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddNodeShowHideLabelsBehavior"
-                       enablesFor="*"
-                       id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddNodeShowHideLabelBehavior"
-                       label="Add behavior to show/hide labels"
-                       menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddNodeShowHideBehavior">
-                    <enablement>
-                       <objectClass
-                             name="org.eclipse.gmf.codegen.gmfgen.GenNode">
-                       </objectClass>
-                    </enablement>
-                 </action>
-               
-                 <action
-               class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddGenLinkStereotypeDisplayBehavior"
-               enablesFor="*"
-               id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddGenLinkStereotypeDisplayBehavior"
-               label="Add label to display applied stereotype for a link"
-               menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddGenLinkStereotypeDisplayBehavior">
-                    <enablement>
-                       <objectClass
-                             name="org.eclipse.gmf.codegen.gmfgen.GenLink">
-                       </objectClass>
-                    </enablement>
-         </action>
-                 <action
-                       class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddExternalNodeStereotypeDisplayBehavior"
-                       enablesFor="*"
-                       id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddExternalNodeStereotypeDisplayBehavior"
-                       label="Add label to display applied stereotype as an external node label"
-                       menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddExternalNodeStereotypeDisplayBehavior">
-                    <enablement>
-                       <objectClass
-                             name="org.eclipse.gmf.codegen.gmfgen.GenNode">
-                       </objectClass>
-                    </enablement>
-                 </action>
-                 <action
-                       class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddExternalNodeFloatingLabelDisplayBehavior"
-                       enablesFor="*"
-                       id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddExternalNodeFloatingNameDisplayBehavior"
-                       label="Add label to display Label as an external Floating node label"
-                       menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddExternalNodeFloatingNameDisplayBehavior">
-                    <enablement>
-                       <objectClass
-                             name="org.eclipse.gmf.codegen.gmfgen.GenNode">
-                       </objectClass>
-                    </enablement>
-                 </action>
-                 <action
-                       class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddHyperLinkPopupBarBehavior"
-                       enablesFor="*"
-                       id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddHyperLinkPopupBarBehavior"
-                       label="Add hyperlink PopupBar Behavior"
-                       menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddHyperLinkPopupBarBehavior">
-                    <enablement>
-                       <objectClass
-                             name="org.eclipse.gmf.codegen.gmfgen.GenNode">
-                       </objectClass>
-                    </enablement>
-                 </action>
-                          <action
-               class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.SetVisualIDWithUnusedValue"
-               enablesFor="*"
-               id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.SetVisualIDWithUnusedValue"
-               label="Set VisualID with unused value"
-               menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/SetVisualIDWithUnusedValue">
-                    <enablement>
-                       <objectClass
-                             name="org.eclipse.gmf.codegen.gmfgen.GenCommonBase">
-                       </objectClass>
-                    </enablement>
-         </action>
-                          <action
-                                class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddSmallAndLargeIconForPaletteAction"
-                                enablesFor="*"
-                                icon="icons/palette_view.gif"
-                                id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.addsmallandlargeiconstopalette"
-                                label="Add Icons to Palette Elements"
-                                menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/iconsManagement">
-                             <enablement>
-                                <or>
-                                   <objectClass
-                                         name="org.eclipse.gmf.codegen.gmfgen.ToolGroup">
-                                   </objectClass>
-                                   <objectClass
-                                         name="org.eclipse.gmf.codegen.gmfgen.Palette">
-                                   </objectClass>
-                                   <objectClass
-                                         name="org.eclipse.gmf.codegen.gmfgen.ToolEntry">
-                                   </objectClass>
-                                </or>
-                             </enablement>
-                          </action>
-                          <action
-                                class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddOrUpdateCommentEditParts"
-                                enablesFor="*"
-                                icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
-                                id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddOrUpdateCommentEditParts"
-                                label="Update Comments For multi label management"
-                                menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddOrUpdateCommentEditParts">
-                             <enablement>
-                                <objectClass
-                                      name="org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator">
-                                </objectClass>
-                             </enablement>
-                          </action>
-                          <action
-                                class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddDefaultNamedElementAction"
-                                enablesFor="*"
-                                icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
-                                id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddDefaultNamedElementAction"
-                                label="Add DefaultNamedElement EditPart"
-                                menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddHyperLinkPopupBarBehavior">
-                             <enablement>
-                                <or>
-                                   <objectClass
-                                         name="org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator">
-                                   </objectClass>
-                                   <objectClass
-                                         name="org.eclipse.gmf.codegen.gmfgen.GenDiagram">
-                                   </objectClass>
-                                </or>
-                             </enablement>
-                          </action>
-                          <action
-                                class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddShapeNamedElementAction"
-                                enablesFor="*"
-                                icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Image.gif"
-                                id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddShapeNamedElementAction"
-                                label="Add ShapeNamedElement EditPart"
-                                menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddHyperLinkPopupBarBehavior">
-                             <enablement>
-                                <or>
-                                   <objectClass
-                                         name="org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator">
-                                   </objectClass>
-                                   <objectClass
-                                         name="org.eclipse.gmf.codegen.gmfgen.GenDiagram">
-                                   </objectClass>
-                                </or>
-                             </enablement>
-                          </action>
-                          <action
-                                class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.SetCompartmentNeedsTitleToTrueAction"
-                                icon="icons/none_comp_vis.gif"
-                                id="org.eclipse.papyrus.gmfgenextension.action1"
-                                label="Set Compartment &quot;Needs Title&quot; to true"
-                                menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddHyperLinkPopupBarBehavior"
-                                tooltip="Create Compartment Title Visibility Node (and change &quot;Needs Title&quot; to true)">
-                                <enablement>
-                                <or>
-                                   <objectClass
-                                         name="org.eclipse.gmf.codegen.gmfgen.GenCompartment">
-                                   </objectClass>
-                                </or>
-                             </enablement>
-                          </action>
-                          
-                           <action
-                                class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddSemanticElementTypeInGenericTopNode"
-                                icon="icons/GenerateMetamodelType.gif"
-                                id="org.eclipse.papyrus.gmfgenextension.addSemanticElementTypeInGenericTopNode"
-                                label="Add Semantic Element Type In Generic Top Node"
-                                menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddSemanticElementTypeInGenericTopNode"
-                                tooltip="Generate Sermantic Metamodel types for UML metamodel">
-                                <enablement>
-                                <or>
-                                   <objectClass
-                                         name="org.eclipse.gmf.codegen.gmfgen.GenDiagram">
-                                   </objectClass>
-                                </or>
-                             </enablement>
-                          </action>
-                           <action
-                                 class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.UpdateElementTypeToMatchGenericType"
-                                 icon="icons/updateElementType.gif"
-                                 id="org.eclipse.papyrus.gmfgenextension.updateElementTypeToMatchGenericType"
-                                 label="Update ElementType To Match Generic Type"
-                                 menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/UpdateElementTypeToMatchGenericType"
-                                 tooltip="Update ElementType To Match Generic Type">
-                              <enablement>
-                                 <or>
-                                    <objectClass
-                                          name="org.eclipse.gmf.codegen.gmfgen.MetamodelType">
-                                    </objectClass>
-                                    <objectClass
-                                          name="org.eclipse.gmf.codegen.gmfgen.SpecializationType">
-                                    </objectClass>
-                                 </or>
-                              </enablement>
-                           </action>
-                           <action
-                                 class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.DisplayReport"
-                                 enablesFor="*"
-                                 id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.TopNodeRepor"
-                                 label="Display TopNodeReport"
-                                 menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/TopNodeReport">
-                              <enablement>
-                                 <or>
-                                    <objectClass
-                                          name="org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator">
-                                    </objectClass>
-                                    <objectClass
-                                          name="org.eclipse.gmf.codegen.gmfgen.GenDiagram">
-                                    </objectClass>
-                                 </or>
-                              </enablement>
-                           </action>
-                           <action
-                                 class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.TestCodeSetGeneration"
-                                 enablesFor="*"
-                                 id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.TopNodeRepor"
-                                 label="Display test subsetCode"
-                                 menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/testSubsetCode">
-                              <enablement>
-                                 <or>
-                                    <objectClass
-                                          name="org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator">
-                                    </objectClass>
-                                    <objectClass
-                                          name="org.eclipse.gmf.codegen.gmfgen.GenDiagram">
-                                    </objectClass>
-                                 </or>
-                              </enablement>
-                           </action>
-      </objectContribution>
-   </extension>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ <copyright>
+ </copyright>
+
+ $Id$
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <package
+            uri="http://www.eclipse.org/papyrus/2009/papyrusgmfgenextension"
+            class="org.eclipse.papyrus.papyrusgmfgenextension.PapyrusgmfgenextensionPackage"
+            genModel="model/papyrusGmfgenExtension.genmodel"/>
+   </extension>
+   <extension
+         point="org.eclipse.ui.popupMenus">
+
+            <objectContribution
+            adaptable="true"
+            id="org.eclipse.papyrus.papyrusgmfgenextension.popupactions"
+            objectClass="org.eclipse.emf.ecore.EObject">
+                    <menu
+                          icon="icons/PapyrusLogo16x16.gif"
+                          id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus"
+                          label="Papyrus GMFGen Tools"
+                          path="papyrus">
+                    </menu>
+                    <action
+                          class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddNodeQualifiedNameBehavior"
+                          enablesFor="*"
+                          id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddNodeQualifiedNameBehavior"
+                          label="Add behavior to display qualified name"
+                          menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddNodeQualifiedNameBehavior">
+                       <enablement>
+                          <objectClass
+                                name="org.eclipse.gmf.codegen.gmfgen.GenNode">
+                          </objectClass>
+                       </enablement>
+                    </action>
+                 <action
+                       class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddNodeStereotypeDisplayBehavior"
+                       enablesFor="*"
+                       id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddNodeStereotypeDisplayBehavior"
+                       label="Add behavior to display applied stereotype for a node"
+                       menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddNodeStereotypeDisplayBehavior">
+                    <enablement>
+                       <objectClass
+                             name="org.eclipse.gmf.codegen.gmfgen.GenNode">
+                       </objectClass>
+                    </enablement>
+                 </action>
+                 <action
+                       class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddNodeShowHideCompartmentBehavior"
+                       enablesFor="*"
+                       id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddNodeShowHideBehavior"
+                       label="Add behavior to show/hide compartments"
+                       menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddNodeShowHideBehavior">
+                    <enablement>
+                       <objectClass
+                             name="org.eclipse.gmf.codegen.gmfgen.GenNode">
+                       </objectClass>
+                    </enablement>
+                 </action>
+                 <action
+                       class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddNodeShowHideContentsBehavior"
+                       enablesFor="*"
+                       id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddNodeShowHideBehavior"
+                       label="Add behavior to show/hide classifiers contents"
+                       menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddNodeShowHideBehavior">
+                    <enablement>
+                       <objectClass
+                             name="org.eclipse.gmf.codegen.gmfgen.GenNode">
+                       </objectClass>
+                    </enablement>
+                 </action>
+                 <action
+                       class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddNodeShowHideLabelsBehavior"
+                       enablesFor="*"
+                       id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddNodeShowHideLabelBehavior"
+                       label="Add behavior to show/hide labels"
+                       menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddNodeShowHideBehavior">
+                    <enablement>
+                       <objectClass
+                             name="org.eclipse.gmf.codegen.gmfgen.GenNode">
+                       </objectClass>
+                    </enablement>
+                 </action>
+               
+                 <action
+               class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddGenLinkStereotypeDisplayBehavior"
+               enablesFor="*"
+               id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddGenLinkStereotypeDisplayBehavior"
+               label="Add label to display applied stereotype for a link"
+               menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddGenLinkStereotypeDisplayBehavior">
+                    <enablement>
+                       <objectClass
+                             name="org.eclipse.gmf.codegen.gmfgen.GenLink">
+                       </objectClass>
+                    </enablement>
+         </action>
+                 <action
+                       class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddExternalNodeStereotypeDisplayBehavior"
+                       enablesFor="*"
+                       id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddExternalNodeStereotypeDisplayBehavior"
+                       label="Add label to display applied stereotype as an external node label"
+                       menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddExternalNodeStereotypeDisplayBehavior">
+                    <enablement>
+                       <objectClass
+                             name="org.eclipse.gmf.codegen.gmfgen.GenNode">
+                       </objectClass>
+                    </enablement>
+                 </action>
+                 <action
+                       class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddExternalNodeFloatingLabelDisplayBehavior"
+                       enablesFor="*"
+                       id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddExternalNodeFloatingNameDisplayBehavior"
+                       label="Add label to display Label as an external Floating node label"
+                       menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddExternalNodeFloatingNameDisplayBehavior">
+                    <enablement>
+                       <objectClass
+                             name="org.eclipse.gmf.codegen.gmfgen.GenNode">
+                       </objectClass>
+                    </enablement>
+                 </action>
+                 <action
+                       class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddHyperLinkPopupBarBehavior"
+                       enablesFor="*"
+                       id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddHyperLinkPopupBarBehavior"
+                       label="Add hyperlink PopupBar Behavior"
+                       menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddHyperLinkPopupBarBehavior">
+                    <enablement>
+                       <objectClass
+                             name="org.eclipse.gmf.codegen.gmfgen.GenNode">
+                       </objectClass>
+                    </enablement>
+                 </action>
+                          <action
+               class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.SetVisualIDWithUnusedValue"
+               enablesFor="*"
+               id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.SetVisualIDWithUnusedValue"
+               label="Set VisualID with unused value"
+               menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/SetVisualIDWithUnusedValue">
+                    <enablement>
+                       <objectClass
+                             name="org.eclipse.gmf.codegen.gmfgen.GenCommonBase">
+                       </objectClass>
+                    </enablement>
+         </action>
+                          <action
+                                class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddSmallAndLargeIconForPaletteAction"
+                                enablesFor="*"
+                                icon="icons/palette_view.gif"
+                                id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.addsmallandlargeiconstopalette"
+                                label="Add Icons to Palette Elements"
+                                menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/iconsManagement">
+                             <enablement>
+                                <or>
+                                   <objectClass
+                                         name="org.eclipse.gmf.codegen.gmfgen.ToolGroup">
+                                   </objectClass>
+                                   <objectClass
+                                         name="org.eclipse.gmf.codegen.gmfgen.Palette">
+                                   </objectClass>
+                                   <objectClass
+                                         name="org.eclipse.gmf.codegen.gmfgen.ToolEntry">
+                                   </objectClass>
+                                </or>
+                             </enablement>
+                          </action>
+                          <action
+                                class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddOrUpdateCommentEditParts"
+                                enablesFor="*"
+                                icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
+                                id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddOrUpdateCommentEditParts"
+                                label="Update Comments For multi label management"
+                                menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddOrUpdateCommentEditParts">
+                             <enablement>
+                                <objectClass
+                                      name="org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator">
+                                </objectClass>
+                             </enablement>
+                          </action>
+                          <action
+                                class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddDefaultNamedElementAction"
+                                enablesFor="*"
+                                icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+                                id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddDefaultNamedElementAction"
+                                label="Add DefaultNamedElement EditPart"
+                                menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddHyperLinkPopupBarBehavior">
+                             <enablement>
+                                <or>
+                                   <objectClass
+                                         name="org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator">
+                                   </objectClass>
+                                   <objectClass
+                                         name="org.eclipse.gmf.codegen.gmfgen.GenDiagram">
+                                   </objectClass>
+                                </or>
+                             </enablement>
+                          </action>
+                          <action
+                                class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddShapeNamedElementAction"
+                                enablesFor="*"
+                                icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Image.gif"
+                                id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddShapeNamedElementAction"
+                                label="Add ShapeNamedElement EditPart"
+                                menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddHyperLinkPopupBarBehavior">
+                             <enablement>
+                                <or>
+                                   <objectClass
+                                         name="org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator">
+                                   </objectClass>
+                                   <objectClass
+                                         name="org.eclipse.gmf.codegen.gmfgen.GenDiagram">
+                                   </objectClass>
+                                </or>
+                             </enablement>
+                          </action>
+                          <action
+                                class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.SetCompartmentNeedsTitleToTrueAction"
+                                icon="icons/none_comp_vis.gif"
+                                id="org.eclipse.papyrus.gmfgenextension.action1"
+                                label="Set Compartment &quot;Needs Title&quot; to true"
+                                menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddHyperLinkPopupBarBehavior"
+                                tooltip="Create Compartment Title Visibility Node (and change &quot;Needs Title&quot; to true)">
+                                <enablement>
+                                <or>
+                                   <objectClass
+                                         name="org.eclipse.gmf.codegen.gmfgen.GenCompartment">
+                                   </objectClass>
+                                </or>
+                             </enablement>
+                          </action>
+                          
+                           <action
+                                class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.AddSemanticElementTypeInGenericTopNode"
+                                icon="icons/GenerateMetamodelType.gif"
+                                id="org.eclipse.papyrus.gmfgenextension.addSemanticElementTypeInGenericTopNode"
+                                label="Add Semantic Element Type In Generic Top Node"
+                                menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/AddSemanticElementTypeInGenericTopNode"
+                                tooltip="Generate Sermantic Metamodel types for UML metamodel">
+                                <enablement>
+                                <or>
+                                   <objectClass
+                                         name="org.eclipse.gmf.codegen.gmfgen.GenDiagram">
+                                   </objectClass>
+                                </or>
+                             </enablement>
+                          </action>
+                           <action
+                                 class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.UpdateElementTypeToMatchGenericType"
+                                 icon="icons/updateElementType.gif"
+                                 id="org.eclipse.papyrus.gmfgenextension.updateElementTypeToMatchGenericType"
+                                 label="Update ElementType To Match Generic Type"
+                                 menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/UpdateElementTypeToMatchGenericType"
+                                 tooltip="Update ElementType To Match Generic Type">
+                              <enablement>
+                                 <or>
+                                    <objectClass
+                                          name="org.eclipse.gmf.codegen.gmfgen.MetamodelType">
+                                    </objectClass>
+                                    <objectClass
+                                          name="org.eclipse.gmf.codegen.gmfgen.SpecializationType">
+                                    </objectClass>
+                                 </or>
+                              </enablement>
+                           </action>
+                           <action
+                                 class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.DisplayReport"
+                                 enablesFor="*"
+                                 id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.TopNodeRepor"
+                                 label="Display TopNodeReport"
+                                 menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/TopNodeReport">
+                              <enablement>
+                                 <or>
+                                    <objectClass
+                                          name="org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator">
+                                    </objectClass>
+                                    <objectClass
+                                          name="org.eclipse.gmf.codegen.gmfgen.GenDiagram">
+                                    </objectClass>
+                                 </or>
+                              </enablement>
+                           </action>
+                           <action
+                                 class="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.TestCodeSetGeneration"
+                                 enablesFor="*"
+                                 id="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.TopNodeRepor"
+                                 label="Display test subsetCode"
+                                 menubarPath="org.eclipse.papyrus.papyrusgmfgenextension.popupaction.MenuPapyrus/testSubsetCode">
+                              <enablement>
+                                 <or>
+                                    <objectClass
+                                          name="org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator">
+                                    </objectClass>
+                                    <objectClass
+                                          name="org.eclipse.gmf.codegen.gmfgen.GenDiagram">
+                                    </objectClass>
+                                 </or>
+                              </enablement>
+                           </action>
+      </objectContribution>
+   </extension>
+
+</plugin>
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddDefaultNamedElementAction.java b/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddDefaultNamedElementAction.java
index 875f2e6d5ab..7fdf95b7fc8 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddDefaultNamedElementAction.java
+++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddDefaultNamedElementAction.java
@@ -1,163 +1,163 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- *
- * 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:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.papyrusgmfgenextension.popupaction;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.gmf.codegen.gmfgen.GenDiagram;
-import org.eclipse.gmf.codegen.gmfgen.GenLabel;
-import org.eclipse.gmf.codegen.gmfgen.GenTopLevelNode;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * The Class AddDefaultNamedElementAction it create an edti part to show a named element in the diagram
- */
-public class AddDefaultNamedElementAction extends Action {
-
-
-	/** The Constant PACKAGED_ELEMENT_ATTRIBUTE. */
-	protected static final String PACKAGED_ELEMENT_ATTRIBUTE = "packagedElement"; //$NON-NLS-1$
-
-	/** The Constant PACKAGE_NAME. */
-	protected static final String PACKAGE_NAME = "Package"; //$NON-NLS-1$
-
-	/** The Constant UNKNOW_EDITPOLICY. */
-	protected static final String UNKNOW_EDITPOLICY = "YOUR OWN CHANGE SHAPE EDIT POLICY"; //$NON-NLS-1$
-
-	/** The Constant QUALIFIED_NAME_DISPLAY_EDIT_POLICY_VALUE. */
-	protected static final String QUALIFIED_NAME_DISPLAY_EDIT_POLICY_VALUE = "org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"; //$NON-NLS-1$
-
-	/** The Constant NODE_LABEL_DISPLAY_EDIT_POLICY_VALUE. */
-	protected static final String NODE_LABEL_DISPLAY_EDIT_POLICY_VALUE = "org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"; //$NON-NLS-1$
-
-	/** The Constant POPUP_BAR_EDIT_POLICY_VALUE. */
-	protected static final String POPUP_BAR_EDIT_POLICY_VALUE = "org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"; //$NON-NLS-1$
-
-	/** The Constant CHANGE_SHAPE_POLICY_KEY. */
-	protected static final String CHANGE_SHAPE_POLICY_KEY = "org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy.CHANGE_SHAPE_POLICY"; //$NON-NLS-1$
-
-	/** The Constant POLICY_QUALIFIED_NAME_POLICY_KEY. */
-	protected static final String POLICY_QUALIFIED_NAME_POLICY_KEY = "org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"; //$NON-NLS-1$
-
-	/** The Constant STEREOTYPE_LABEL_POLICY_KEY. */
-	protected static final String STEREOTYPE_LABEL_POLICY_KEY = "org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"; //$NON-NLS-1$
-
-	/** The Constant POPUPBAR_ROLE_KEY. */
-	protected static final String POPUPBAR_ROLE_KEY = "org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"; //$NON-NLS-1$
-
-	/** The Constant NAME_ATTRIBUTE. */
-	protected static final String NAME_ATTRIBUTE = "name"; //$NON-NLS-1$
-
-	/** The Constant NAMED_ELEMENT_NAME. */
-	protected static final String NAMED_ELEMENT_NAME = "NamedElement"; //$NON-NLS-1$
-
-	/** The Constant NODE_NAMED_ELEMENT_FIGURE. */
-	protected static final String NODE_NAMED_ELEMENT_FIGURE = "org.eclipse.papyrus.diagram.common.figure.node.NodeNamedElementFigure"; //$NON-NLS-1$
-
-	/** The Constant GMF_NODE. */
-	protected static final String GMF_NODE = "Node"; //$NON-NLS-1$
-
-	/** The Constant WRAPPING_LABEL. */
-	protected static final String WRAPPING_LABEL = "org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"; //$NON-NLS-1$
-
-	/** The Constant DEFAULT_NAMED_ELEMENT_NAME. */
-	protected static final String DEFAULT_NAMED_ELEMENT_NAME = "DefaultNamedElementName"; //$NON-NLS-1$
-
-	/** The Constant URI_UML_GENMODEL. */
-	protected static final String URI_UML_GENMODEL = "org.eclipse.uml2.uml/model/UML.genmodel"; //$NON-NLS-1$
-
-	/** The Constant URI_NOTATION_GENMODEL. */
-	protected static final String URI_NOTATION_GENMODEL = "org.eclipse.gmf.runtime.notation/model/notation.genmodel"; //$NON-NLS-1$
-
-	/** The Constant DEFAULT_NAMED_ELEMENT. */
-	private static final String DEFAULT_NAMED_ELEMENT = "DefaultNamedElement"; //$NON-NLS-1$
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 *
-	 * @param action
-	 */
-	@Override
-	public void run(IAction action) {
-		Iterator<EObject> it = getSelectedEObject().iterator();
-		while (it.hasNext()) {
-			EObject eObject = it.next();
-			if (eObject instanceof GenDiagram) {
-				GenDiagram genDiagram = ((GenDiagram) eObject);
-				createTopNode(genDiagram);
-			}
-		}
-	}
-
-	/**
-	 * Creates the top node.
-	 *
-	 * @param genDiagram
-	 *            the gen diagram
-	 */
-	public void createTopNode(GenDiagram genDiagram) {
-		URI uri_notation = URI.createPlatformPluginURI(URI_NOTATION_GENMODEL, false);
-
-		Resource notation = genDiagram.eResource().getResourceSet().getResource(uri_notation, true);
-
-		GenTopLevelNode topNode = EditpartGenHelper.createTopNode(genDiagram, DEFAULT_NAMED_ELEMENT, findGenClass(notation, GMF_NODE));
-		genDiagram.getTopLevelNodes().add(topNode);
-		EditpartGenHelper.createMetaModelType(topNode, DEFAULT_NAMED_ELEMENT);
-		addBehavior(topNode);
-		addModelFacet(topNode);
-		GenLabel label = EditpartGenHelper.createGenNodeLabel(topNode, DEFAULT_NAMED_ELEMENT_NAME, findGenClass(notation, GMF_NODE));
-		EditpartGenHelper.createLabelViewMap(label, WRAPPING_LABEL);
-		findGenClass(notation, GMF_NODE);
-		EditpartGenHelper.createFigureViewMap(topNode, NODE_NAMED_ELEMENT_FIGURE, 100, 50);
-		URI uri_uml = URI.createPlatformPluginURI(URI_UML_GENMODEL, false);
-		Resource uml = topNode.eResource().getResourceSet().getResource(uri_uml, true);
-		EditpartGenHelper.createLabelModelFacet(label, findGenFeature(uml, NAMED_ELEMENT_NAME, NAME_ATTRIBUTE), EditpartGenHelper.getFirstPredefinedParse(genDiagram.getEditorGen()));
-		MessageDialog.open(MessageDialog.INFORMATION, new Shell(), Messages.generalInformation, Messages.message_Intro + Messages.rulesAboutNamedElement + Messages.ruleAboutChangeEditPolicy, MessageDialog.NONE);
-
-	}
-
-	/**
-	 * Adds behaviors.
-	 *
-	 * @param topNode
-	 *            the top node
-	 */
-	public void addBehavior(GenTopLevelNode topNode) {
-		// add behavior
-		EditpartGenHelper.addBehavior(topNode, POPUPBAR_ROLE_KEY, POPUP_BAR_EDIT_POLICY_VALUE);
-		EditpartGenHelper.addBehavior(topNode, STEREOTYPE_LABEL_POLICY_KEY, NODE_LABEL_DISPLAY_EDIT_POLICY_VALUE);
-		EditpartGenHelper.addBehavior(topNode, POLICY_QUALIFIED_NAME_POLICY_KEY, QUALIFIED_NAME_DISPLAY_EDIT_POLICY_VALUE);
-		EditpartGenHelper.addBehavior(topNode, CHANGE_SHAPE_POLICY_KEY, UNKNOW_EDITPOLICY);
-	}
-
-	/**
-	 * Adds the model facet.
-	 *
-	 * @param topNode
-	 *            the top node
-	 */
-	public void addModelFacet(GenTopLevelNode topNode) {
-		URI uri_uml = URI.createPlatformPluginURI(URI_UML_GENMODEL, false);
-		Resource uml = topNode.eResource().getResourceSet().getResource(uri_uml, true);
-		EditpartGenHelper.createModelFacet(topNode, findGenFeature(uml, PACKAGE_NAME, PACKAGED_ELEMENT_ATTRIBUTE), findGenClass(uml, NAMED_ELEMENT_NAME));
-
-	}
-
-}
+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * 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:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.papyrusgmfgenextension.popupaction;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.gmf.codegen.gmfgen.GenDiagram;
+import org.eclipse.gmf.codegen.gmfgen.GenLabel;
+import org.eclipse.gmf.codegen.gmfgen.GenTopLevelNode;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.widgets.Shell;
+
+
+/**
+ * The Class AddDefaultNamedElementAction it create an edti part to show a named element in the diagram
+ */
+public class AddDefaultNamedElementAction extends Action {
+
+
+	/** The Constant PACKAGED_ELEMENT_ATTRIBUTE. */
+	protected static final String PACKAGED_ELEMENT_ATTRIBUTE = "packagedElement"; //$NON-NLS-1$
+
+	/** The Constant PACKAGE_NAME. */
+	protected static final String PACKAGE_NAME = "Package"; //$NON-NLS-1$
+
+	/** The Constant UNKNOW_EDITPOLICY. */
+	protected static final String UNKNOW_EDITPOLICY = "YOUR OWN CHANGE SHAPE EDIT POLICY"; //$NON-NLS-1$
+
+	/** The Constant QUALIFIED_NAME_DISPLAY_EDIT_POLICY_VALUE. */
+	protected static final String QUALIFIED_NAME_DISPLAY_EDIT_POLICY_VALUE = "org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"; //$NON-NLS-1$
+
+	/** The Constant NODE_LABEL_DISPLAY_EDIT_POLICY_VALUE. */
+	protected static final String NODE_LABEL_DISPLAY_EDIT_POLICY_VALUE = "org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"; //$NON-NLS-1$
+
+	/** The Constant POPUP_BAR_EDIT_POLICY_VALUE. */
+	protected static final String POPUP_BAR_EDIT_POLICY_VALUE = "org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"; //$NON-NLS-1$
+
+	/** The Constant CHANGE_SHAPE_POLICY_KEY. */
+	protected static final String CHANGE_SHAPE_POLICY_KEY = "org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy.CHANGE_SHAPE_POLICY"; //$NON-NLS-1$
+
+	/** The Constant POLICY_QUALIFIED_NAME_POLICY_KEY. */
+	protected static final String POLICY_QUALIFIED_NAME_POLICY_KEY = "org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"; //$NON-NLS-1$
+
+	/** The Constant STEREOTYPE_LABEL_POLICY_KEY. */
+	protected static final String STEREOTYPE_LABEL_POLICY_KEY = "org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"; //$NON-NLS-1$
+
+	/** The Constant POPUPBAR_ROLE_KEY. */
+	protected static final String POPUPBAR_ROLE_KEY = "org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"; //$NON-NLS-1$
+
+	/** The Constant NAME_ATTRIBUTE. */
+	protected static final String NAME_ATTRIBUTE = "name"; //$NON-NLS-1$
+
+	/** The Constant NAMED_ELEMENT_NAME. */
+	protected static final String NAMED_ELEMENT_NAME = "NamedElement"; //$NON-NLS-1$
+
+	/** The Constant NODE_NAMED_ELEMENT_FIGURE. */
+	protected static final String NODE_NAMED_ELEMENT_FIGURE = "org.eclipse.papyrus.diagram.common.figure.node.NodeNamedElementFigure"; //$NON-NLS-1$
+
+	/** The Constant GMF_NODE. */
+	protected static final String GMF_NODE = "Node"; //$NON-NLS-1$
+
+	/** The Constant WRAPPING_LABEL. */
+	protected static final String WRAPPING_LABEL = "org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"; //$NON-NLS-1$
+
+	/** The Constant DEFAULT_NAMED_ELEMENT_NAME. */
+	protected static final String DEFAULT_NAMED_ELEMENT_NAME = "DefaultNamedElementName"; //$NON-NLS-1$
+
+	/** The Constant URI_UML_GENMODEL. */
+	protected static final String URI_UML_GENMODEL = "org.eclipse.uml2.uml/model/UML.genmodel"; //$NON-NLS-1$
+
+	/** The Constant URI_NOTATION_GENMODEL. */
+	protected static final String URI_NOTATION_GENMODEL = "org.eclipse.gmf.runtime.notation/model/notation.genmodel"; //$NON-NLS-1$
+
+	/** The Constant DEFAULT_NAMED_ELEMENT. */
+	private static final String DEFAULT_NAMED_ELEMENT = "DefaultNamedElement"; //$NON-NLS-1$
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
+	 *
+	 * @param action
+	 */
+	@Override
+	public void run(IAction action) {
+		Iterator<EObject> it = getSelectedEObject().iterator();
+		while (it.hasNext()) {
+			EObject eObject = it.next();
+			if (eObject instanceof GenDiagram) {
+				GenDiagram genDiagram = ((GenDiagram) eObject);
+				createTopNode(genDiagram);
+			}
+		}
+	}
+
+	/**
+	 * Creates the top node.
+	 *
+	 * @param genDiagram
+	 *            the gen diagram
+	 */
+	public void createTopNode(GenDiagram genDiagram) {
+		URI uri_notation = URI.createPlatformPluginURI(URI_NOTATION_GENMODEL, false);
+
+		Resource notation = genDiagram.eResource().getResourceSet().getResource(uri_notation, true);
+
+		GenTopLevelNode topNode = EditpartGenHelper.createTopNode(genDiagram, DEFAULT_NAMED_ELEMENT, findGenClass(notation, GMF_NODE));
+		genDiagram.getTopLevelNodes().add(topNode);
+		EditpartGenHelper.createMetaModelType(topNode, DEFAULT_NAMED_ELEMENT);
+		addBehavior(topNode);
+		addModelFacet(topNode);
+		GenLabel label = EditpartGenHelper.createGenNodeLabel(topNode, DEFAULT_NAMED_ELEMENT_NAME, findGenClass(notation, GMF_NODE));
+		EditpartGenHelper.createLabelViewMap(label, WRAPPING_LABEL);
+		findGenClass(notation, GMF_NODE);
+		EditpartGenHelper.createFigureViewMap(topNode, NODE_NAMED_ELEMENT_FIGURE, 100, 50);
+		URI uri_uml = URI.createPlatformPluginURI(URI_UML_GENMODEL, false);
+		Resource uml = topNode.eResource().getResourceSet().getResource(uri_uml, true);
+		EditpartGenHelper.createLabelModelFacet(label, findGenFeature(uml, NAMED_ELEMENT_NAME, NAME_ATTRIBUTE), EditpartGenHelper.getFirstPredefinedParse(genDiagram.getEditorGen()));
+		MessageDialog.open(MessageDialog.INFORMATION, new Shell(), Messages.generalInformation, Messages.message_Intro + Messages.rulesAboutNamedElement + Messages.ruleAboutChangeEditPolicy, MessageDialog.NONE);
+
+	}
+
+	/**
+	 * Adds behaviors.
+	 *
+	 * @param topNode
+	 *            the top node
+	 */
+	public void addBehavior(GenTopLevelNode topNode) {
+		// add behavior
+		EditpartGenHelper.addBehavior(topNode, POPUPBAR_ROLE_KEY, POPUP_BAR_EDIT_POLICY_VALUE);
+		EditpartGenHelper.addBehavior(topNode, STEREOTYPE_LABEL_POLICY_KEY, NODE_LABEL_DISPLAY_EDIT_POLICY_VALUE);
+		EditpartGenHelper.addBehavior(topNode, POLICY_QUALIFIED_NAME_POLICY_KEY, QUALIFIED_NAME_DISPLAY_EDIT_POLICY_VALUE);
+		EditpartGenHelper.addBehavior(topNode, CHANGE_SHAPE_POLICY_KEY, UNKNOW_EDITPOLICY);
+	}
+
+	/**
+	 * Adds the model facet.
+	 *
+	 * @param topNode
+	 *            the top node
+	 */
+	public void addModelFacet(GenTopLevelNode topNode) {
+		URI uri_uml = URI.createPlatformPluginURI(URI_UML_GENMODEL, false);
+		Resource uml = topNode.eResource().getResourceSet().getResource(uri_uml, true);
+		EditpartGenHelper.createModelFacet(topNode, findGenFeature(uml, PACKAGE_NAME, PACKAGED_ELEMENT_ATTRIBUTE), findGenClass(uml, NAMED_ELEMENT_NAME));
+
+	}
+
+}
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideCompartmentBehavior.java b/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideCompartmentBehavior.java
index 0cd2a891baf..45273d28247 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideCompartmentBehavior.java
+++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideCompartmentBehavior.java
@@ -1,56 +1,56 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- *
- * 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:
- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.papyrusgmfgenextension.popupaction;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.codegen.gmfgen.GenNode;
-import org.eclipse.jface.action.IAction;
-
-
-/**
- * This class is used to add a behavior for node which have compartments.
- * This behavior allows to show or hide the compartments
- */
-public class AddNodeShowHideCompartmentBehavior extends Action {
-
-	/** the key for the EditPolicy to add */
-	public static final String SHOW_HIDE_COMPARTMENT_POLICY_KEY = "org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"; //$NON-NLS-1$
-
-	/** the path for the EditPolicy */
-	public static final String SHOW_HIDE_COMPARTMENT_POLICY_CLASS = "org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"; //$NON-NLS-1$
-
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	@Override
-	public void run(IAction action) {
-		// Parse selected GenLink(s) and add the desired CustomBehavior
-		Iterator<EObject> it = getSelectedEObject().iterator();
-		while (it.hasNext()) {
-			EObject eObject = it.next();
-			if (eObject instanceof GenNode) {
-				// test if it has got a external node to display applied stereotype
-				if (!hasCustomBehavior(((GenNode) eObject), SHOW_HIDE_COMPARTMENT_POLICY_KEY)) {
-					addCustomBehavior((GenNode) eObject, SHOW_HIDE_COMPARTMENT_POLICY_KEY, SHOW_HIDE_COMPARTMENT_POLICY_CLASS);
-				}
-			}
-		}
-	}
-
-}
+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.papyrusgmfgenextension.popupaction;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.codegen.gmfgen.GenNode;
+import org.eclipse.jface.action.IAction;
+
+
+/**
+ * This class is used to add a behavior for node which have compartments.
+ * This behavior allows to show or hide the compartments
+ */
+public class AddNodeShowHideCompartmentBehavior extends Action {
+
+	/** the key for the EditPolicy to add */
+	public static final String SHOW_HIDE_COMPARTMENT_POLICY_KEY = "org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"; //$NON-NLS-1$
+
+	/** the path for the EditPolicy */
+	public static final String SHOW_HIDE_COMPARTMENT_POLICY_CLASS = "org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"; //$NON-NLS-1$
+
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
+	 */
+	@Override
+	public void run(IAction action) {
+		// Parse selected GenLink(s) and add the desired CustomBehavior
+		Iterator<EObject> it = getSelectedEObject().iterator();
+		while (it.hasNext()) {
+			EObject eObject = it.next();
+			if (eObject instanceof GenNode) {
+				// test if it has got a external node to display applied stereotype
+				if (!hasCustomBehavior(((GenNode) eObject), SHOW_HIDE_COMPARTMENT_POLICY_KEY)) {
+					addCustomBehavior((GenNode) eObject, SHOW_HIDE_COMPARTMENT_POLICY_KEY, SHOW_HIDE_COMPARTMENT_POLICY_CLASS);
+				}
+			}
+		}
+	}
+
+}
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideContentsBehavior.java b/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideContentsBehavior.java
index 619f2b2e38c..aa653e44c77 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideContentsBehavior.java
+++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideContentsBehavior.java
@@ -1,51 +1,51 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- *
- * 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:
- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.papyrusgmfgenextension.popupaction;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.codegen.gmfgen.GenNode;
-import org.eclipse.jface.action.IAction;
-
-
-public class AddNodeShowHideContentsBehavior extends Action {
-
-	/** the key for the EditPolicy to add. */
-	public static final String SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY_KEY = "org.eclipse.papyrus.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"; //$NON-NLS-1$
-
-	/** the path for the EditPolicy */
-	public static final String SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY_CLASS = "org.eclipse.papyrus.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"; //$NON-NLS-1$
-
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	@Override
-	public void run(IAction action) {
-		// Parse selected GenLink(s) and add the desired CustomBehavior
-		Iterator<EObject> it = getSelectedEObject().iterator();
-		while (it.hasNext()) {
-			EObject eObject = it.next();
-			if (eObject instanceof GenNode) {
-				// test if it has got a external node to display applied stereotype
-				if (!hasCustomBehavior(((GenNode) eObject), SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY_KEY)) {
-					addCustomBehavior((GenNode) eObject, SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY_KEY, SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY_CLASS);
-				}
-			}
-		}
-	}
-}
+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.papyrusgmfgenextension.popupaction;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.codegen.gmfgen.GenNode;
+import org.eclipse.jface.action.IAction;
+
+
+public class AddNodeShowHideContentsBehavior extends Action {
+
+	/** the key for the EditPolicy to add. */
+	public static final String SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY_KEY = "org.eclipse.papyrus.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY"; //$NON-NLS-1$
+
+	/** the path for the EditPolicy */
+	public static final String SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY_CLASS = "org.eclipse.papyrus.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy"; //$NON-NLS-1$
+
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
+	 */
+	@Override
+	public void run(IAction action) {
+		// Parse selected GenLink(s) and add the desired CustomBehavior
+		Iterator<EObject> it = getSelectedEObject().iterator();
+		while (it.hasNext()) {
+			EObject eObject = it.next();
+			if (eObject instanceof GenNode) {
+				// test if it has got a external node to display applied stereotype
+				if (!hasCustomBehavior(((GenNode) eObject), SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY_KEY)) {
+					addCustomBehavior((GenNode) eObject, SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY_KEY, SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY_CLASS);
+				}
+			}
+		}
+	}
+}
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideLabelsBehavior.java b/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideLabelsBehavior.java
index b17292aaa29..787f680138e 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideLabelsBehavior.java
+++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddNodeShowHideLabelsBehavior.java
@@ -1,53 +1,53 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- *
- * 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:
- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.papyrusgmfgenextension.popupaction;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.codegen.gmfgen.GenLink;
-import org.eclipse.gmf.codegen.gmfgen.GenLinkLabel;
-import org.eclipse.gmf.codegen.gmfgen.GenNode;
-import org.eclipse.gmf.codegen.gmfgen.GenNodeLabel;
-import org.eclipse.jface.action.IAction;
-
-
-public class AddNodeShowHideLabelsBehavior extends Action {
-
-	/** the key for the EditPolicy to add. */
-	public static final String SHOW_HIDE_LABEL_POLICY_KEY = "org.eclipse.papyrus.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"; //$NON-NLS-1$
-
-	/** the path for the EditPolicy */
-	public static final String SHOW_HIDE_LABEL_POLICY_CLASS = "org.eclipse.papyrus.diagram.common.editpolicies.ShowHideLabelEditPolicy"; //$NON-NLS-1$
-
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	@Override
-	public void run(IAction action) {
-		// Parse selected GenLink(s) and add the desired CustomBehavior
-		Iterator<EObject> it = getSelectedEObject().iterator();
-		while (it.hasNext()) {
-			EObject eObject = it.next();
-			if ((eObject instanceof GenNode || eObject instanceof GenLink) && (!(eObject instanceof GenNodeLabel) && !(eObject instanceof GenLinkLabel))) {
-				// test if it has got a external node to display applied stereotype
-				if (!hasCustomBehavior(((GenNode) eObject), SHOW_HIDE_LABEL_POLICY_KEY)) {
-					addCustomBehavior((GenNode) eObject, SHOW_HIDE_LABEL_POLICY_KEY, SHOW_HIDE_LABEL_POLICY_CLASS);
-				}
-			}
-		}
-	}
+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ *
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.papyrusgmfgenextension.popupaction;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.codegen.gmfgen.GenLink;
+import org.eclipse.gmf.codegen.gmfgen.GenLinkLabel;
+import org.eclipse.gmf.codegen.gmfgen.GenNode;
+import org.eclipse.gmf.codegen.gmfgen.GenNodeLabel;
+import org.eclipse.jface.action.IAction;
+
+
+public class AddNodeShowHideLabelsBehavior extends Action {
+
+	/** the key for the EditPolicy to add. */
+	public static final String SHOW_HIDE_LABEL_POLICY_KEY = "org.eclipse.papyrus.diagram.common.editpolicies.ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE"; //$NON-NLS-1$
+
+	/** the path for the EditPolicy */
+	public static final String SHOW_HIDE_LABEL_POLICY_CLASS = "org.eclipse.papyrus.diagram.common.editpolicies.ShowHideLabelEditPolicy"; //$NON-NLS-1$
+
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
+	 */
+	@Override
+	public void run(IAction action) {
+		// Parse selected GenLink(s) and add the desired CustomBehavior
+		Iterator<EObject> it = getSelectedEObject().iterator();
+		while (it.hasNext()) {
+			EObject eObject = it.next();
+			if ((eObject instanceof GenNode || eObject instanceof GenLink) && (!(eObject instanceof GenNodeLabel) && !(eObject instanceof GenLinkLabel))) {
+				// test if it has got a external node to display applied stereotype
+				if (!hasCustomBehavior(((GenNode) eObject), SHOW_HIDE_LABEL_POLICY_KEY)) {
+					addCustomBehavior((GenNode) eObject, SHOW_HIDE_LABEL_POLICY_KEY, SHOW_HIDE_LABEL_POLICY_CLASS);
+				}
+			}
+		}
+	}
 }
 \ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddShapeNamedElementAction.java b/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddShapeNamedElementAction.java
index 941edd9aa73..e861db22341 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddShapeNamedElementAction.java
+++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/AddShapeNamedElementAction.java
@@ -1,173 +1,173 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- *
- * 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:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.papyrusgmfgenextension.popupaction;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.gmf.codegen.gmfgen.GenDiagram;
-import org.eclipse.gmf.codegen.gmfgen.GenLabel;
-import org.eclipse.gmf.codegen.gmfgen.GenTopLevelNode;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Shell;
-
-
-
-/**
- * The Class AddShapeNamedElementAction: create an edit part to display an element as the shape that comes from applied stereotypes.
- */
-public class AddShapeNamedElementAction extends Action {
-
-
-	/** The Constant MESSAGE_INTRO. */
-	protected static final String MESSAGE_INTRO = Messages.message_Intro;
-
-	/** The Constant MESSAGE_INFO_1. */
-	protected static final String MESSAGE_INFO_1 = Messages.rulesAboutShapeEditPart;
-
-	/** The Constant MESSAGE_INFO_2. */
-	protected static final String MESSAGE_INFO_2 = Messages.ruleAboutChangeEditPolicy;
-
-	/** The Constant PACKAGED_ELEMENT_ATTRIBUTE. */
-	protected static final String PACKAGED_ELEMENT_ATTRIBUTE = "packagedElement"; //$NON-NLS-1$
-
-	/** The Constant PACKAGE_NAME. */
-	protected static final String PACKAGE_NAME = "Package"; //$NON-NLS-1$
-
-	/** The Constant UNKNOW_EDITPOLICY. */
-	protected static final String UNKNOW_EDITPOLICY = "YOUR OWN CHANGE SHAPE EDIT POLICY"; //$NON-NLS-1$
-
-	/** The Constant QUALIFIED_NAME_DISPLAY_EDIT_POLICY_VALUE. */
-	protected static final String QUALIFIED_NAME_DISPLAY_EDIT_POLICY_VALUE = "org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"; //$NON-NLS-1$
-
-	/** The Constant NODE_LABEL_DISPLAY_EDIT_POLICY_VALUE. */
-	protected static final String NODE_LABEL_DISPLAY_EDIT_POLICY_VALUE = "org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"; //$NON-NLS-1$
-
-	/** The Constant POPUP_BAR_EDIT_POLICY_VALUE. */
-	protected static final String POPUP_BAR_EDIT_POLICY_VALUE = "org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"; //$NON-NLS-1$
-
-	/** The Constant CHANGE_SHAPE_POLICY_KEY. */
-	protected static final String CHANGE_SHAPE_POLICY_KEY = "org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy.CHANGE_SHAPE_POLICY"; //$NON-NLS-1$
-
-	/** The Constant POLICY_QUALIFIED_NAME_POLICY_KEY. */
-	protected static final String POLICY_QUALIFIED_NAME_POLICY_KEY = "org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"; //$NON-NLS-1$
-
-	/** The Constant STEREOTYPE_LABEL_POLICY_KEY. */
-	protected static final String STEREOTYPE_LABEL_POLICY_KEY = "org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"; //$NON-NLS-1$
-
-	/** The Constant POPUPBAR_ROLE_KEY. */
-	protected static final String POPUPBAR_ROLE_KEY = "org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"; //$NON-NLS-1$
-
-	/** The Constant NAME_ATTRIBUTE. */
-	protected static final String NAME_ATTRIBUTE = "name"; //$NON-NLS-1$
-
-	/** The Constant NAMED_ELEMENT_NAME. */
-	protected static final String NAMED_ELEMENT_NAME = "NamedElement"; //$NON-NLS-1$
-
-	/** The Constant NODE_NAMED_ELEMENT_FIGURE. */
-	protected static final String NODE_NAMED_ELEMENT_FIGURE = "org.eclipse.papyrus.diagram.common.figure.node.ShapeNamedElementFigure"; //$NON-NLS-1$
-
-	/** The Constant GMF_NODE. */
-	protected static final String GMF_NODE = "Node"; //$NON-NLS-1$
-
-	/** The Constant WRAPPING_LABEL. */
-	protected static final String WRAPPING_LABEL = "org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"; //$NON-NLS-1$
-
-	/** The Constant DEFAULT_NAMED_ELEMENT_NAME. */
-	protected static final String DEFAULT_NAMED_ELEMENT_NAME = "ShapeNamedElementName"; //$NON-NLS-1$
-
-	/** The Constant URI_UML_GENMODEL. */
-	protected static final String URI_UML_GENMODEL = "org.eclipse.uml2.uml/model/UML.genmodel"; //$NON-NLS-1$
-
-	/** The Constant URI_NOTATION_GENMODEL. */
-	protected static final String URI_NOTATION_GENMODEL = "org.eclipse.gmf.runtime.notation/model/notation.genmodel"; //$NON-NLS-1$
-
-	/** The Constant DEFAULT_NAMED_ELEMENT. */
-	private static final String DEFAULT_NAMED_ELEMENT = "ShapeNamedElement"; //$NON-NLS-1$
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 *
-	 * @param action
-	 */
-	@Override
-	public void run(IAction action) {
-		Iterator<EObject> it = getSelectedEObject().iterator();
-		while (it.hasNext()) {
-			EObject eObject = it.next();
-			if (eObject instanceof GenDiagram) {
-				GenDiagram genDiagram = ((GenDiagram) eObject);
-				createTopNode(genDiagram);
-			}
-		}
-	}
-
-	/**
-	 * Creates the top node.
-	 *
-	 * @param genDiagram
-	 *            the gen diagram
-	 */
-	public void createTopNode(GenDiagram genDiagram) {
-		URI uri_notation = URI.createPlatformPluginURI(URI_NOTATION_GENMODEL, false);
-
-		Resource notation = genDiagram.eResource().getResourceSet().getResource(uri_notation, true);
-
-		GenTopLevelNode topNode = EditpartGenHelper.createTopNode(genDiagram, DEFAULT_NAMED_ELEMENT, findGenClass(notation, GMF_NODE));
-		genDiagram.getTopLevelNodes().add(topNode);
-		EditpartGenHelper.createMetaModelType(topNode, DEFAULT_NAMED_ELEMENT);
-		addBehavior(topNode);
-		addModelFacet(topNode);
-		GenLabel label = EditpartGenHelper.createExternalGenNodeLabel(topNode, DEFAULT_NAMED_ELEMENT_NAME, findGenClass(notation, GMF_NODE));
-		EditpartGenHelper.createLabelViewMap(label, WRAPPING_LABEL);
-		findGenClass(notation, GMF_NODE);
-		EditpartGenHelper.createFigureViewMap(topNode, NODE_NAMED_ELEMENT_FIGURE, 100, 50);
-		URI uri_uml = URI.createPlatformPluginURI(URI_UML_GENMODEL, false);
-		Resource uml = topNode.eResource().getResourceSet().getResource(uri_uml, true);
-		EditpartGenHelper.createLabelModelFacet(label, findGenFeature(uml, NAMED_ELEMENT_NAME, NAME_ATTRIBUTE), EditpartGenHelper.getFirstPredefinedParse(genDiagram.getEditorGen()));
-		MessageDialog.open(MessageDialog.INFORMATION, new Shell(), Messages.generalInformation, MESSAGE_INTRO + MESSAGE_INFO_1 + MESSAGE_INFO_2, MessageDialog.NONE);
-
-	}
-
-	/**
-	 * Adds the behavior.
-	 *
-	 * @param topNode
-	 *            the top node
-	 */
-	public void addBehavior(GenTopLevelNode topNode) {
-		// add behavior
-		EditpartGenHelper.addBehavior(topNode, POPUPBAR_ROLE_KEY, POPUP_BAR_EDIT_POLICY_VALUE);
-		EditpartGenHelper.addBehavior(topNode, STEREOTYPE_LABEL_POLICY_KEY, NODE_LABEL_DISPLAY_EDIT_POLICY_VALUE);
-		EditpartGenHelper.addBehavior(topNode, POLICY_QUALIFIED_NAME_POLICY_KEY, QUALIFIED_NAME_DISPLAY_EDIT_POLICY_VALUE);
-		EditpartGenHelper.addBehavior(topNode, CHANGE_SHAPE_POLICY_KEY, UNKNOW_EDITPOLICY);
-	}
-
-	/**
-	 * Adds the model facet.
-	 *
-	 * @param topNode
-	 *            the top node
-	 */
-	public void addModelFacet(GenTopLevelNode topNode) {
-		URI uri_uml = URI.createPlatformPluginURI(URI_UML_GENMODEL, false);
-		Resource uml = topNode.eResource().getResourceSet().getResource(uri_uml, true);
-		EditpartGenHelper.createModelFacet(topNode, findGenFeature(uml, PACKAGE_NAME, PACKAGED_ELEMENT_ATTRIBUTE), findGenClass(uml, NAMED_ELEMENT_NAME));
-
-	}
-
-}
+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * 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:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.papyrusgmfgenextension.popupaction;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.gmf.codegen.gmfgen.GenDiagram;
+import org.eclipse.gmf.codegen.gmfgen.GenLabel;
+import org.eclipse.gmf.codegen.gmfgen.GenTopLevelNode;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.widgets.Shell;
+
+
+
+/**
+ * The Class AddShapeNamedElementAction: create an edit part to display an element as the shape that comes from applied stereotypes.
+ */
+public class AddShapeNamedElementAction extends Action {
+
+
+	/** The Constant MESSAGE_INTRO. */
+	protected static final String MESSAGE_INTRO = Messages.message_Intro;
+
+	/** The Constant MESSAGE_INFO_1. */
+	protected static final String MESSAGE_INFO_1 = Messages.rulesAboutShapeEditPart;
+
+	/** The Constant MESSAGE_INFO_2. */
+	protected static final String MESSAGE_INFO_2 = Messages.ruleAboutChangeEditPolicy;
+
+	/** The Constant PACKAGED_ELEMENT_ATTRIBUTE. */
+	protected static final String PACKAGED_ELEMENT_ATTRIBUTE = "packagedElement"; //$NON-NLS-1$
+
+	/** The Constant PACKAGE_NAME. */
+	protected static final String PACKAGE_NAME = "Package"; //$NON-NLS-1$
+
+	/** The Constant UNKNOW_EDITPOLICY. */
+	protected static final String UNKNOW_EDITPOLICY = "YOUR OWN CHANGE SHAPE EDIT POLICY"; //$NON-NLS-1$
+
+	/** The Constant QUALIFIED_NAME_DISPLAY_EDIT_POLICY_VALUE. */
+	protected static final String QUALIFIED_NAME_DISPLAY_EDIT_POLICY_VALUE = "org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"; //$NON-NLS-1$
+
+	/** The Constant NODE_LABEL_DISPLAY_EDIT_POLICY_VALUE. */
+	protected static final String NODE_LABEL_DISPLAY_EDIT_POLICY_VALUE = "org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"; //$NON-NLS-1$
+
+	/** The Constant POPUP_BAR_EDIT_POLICY_VALUE. */
+	protected static final String POPUP_BAR_EDIT_POLICY_VALUE = "org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy"; //$NON-NLS-1$
+
+	/** The Constant CHANGE_SHAPE_POLICY_KEY. */
+	protected static final String CHANGE_SHAPE_POLICY_KEY = "org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy.CHANGE_SHAPE_POLICY"; //$NON-NLS-1$
+
+	/** The Constant POLICY_QUALIFIED_NAME_POLICY_KEY. */
+	protected static final String POLICY_QUALIFIED_NAME_POLICY_KEY = "org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"; //$NON-NLS-1$
+
+	/** The Constant STEREOTYPE_LABEL_POLICY_KEY. */
+	protected static final String STEREOTYPE_LABEL_POLICY_KEY = "org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"; //$NON-NLS-1$
+
+	/** The Constant POPUPBAR_ROLE_KEY. */
+	protected static final String POPUPBAR_ROLE_KEY = "org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"; //$NON-NLS-1$
+
+	/** The Constant NAME_ATTRIBUTE. */
+	protected static final String NAME_ATTRIBUTE = "name"; //$NON-NLS-1$
+
+	/** The Constant NAMED_ELEMENT_NAME. */
+	protected static final String NAMED_ELEMENT_NAME = "NamedElement"; //$NON-NLS-1$
+
+	/** The Constant NODE_NAMED_ELEMENT_FIGURE. */
+	protected static final String NODE_NAMED_ELEMENT_FIGURE = "org.eclipse.papyrus.diagram.common.figure.node.ShapeNamedElementFigure"; //$NON-NLS-1$
+
+	/** The Constant GMF_NODE. */
+	protected static final String GMF_NODE = "Node"; //$NON-NLS-1$
+
+	/** The Constant WRAPPING_LABEL. */
+	protected static final String WRAPPING_LABEL = "org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"; //$NON-NLS-1$
+
+	/** The Constant DEFAULT_NAMED_ELEMENT_NAME. */
+	protected static final String DEFAULT_NAMED_ELEMENT_NAME = "ShapeNamedElementName"; //$NON-NLS-1$
+
+	/** The Constant URI_UML_GENMODEL. */
+	protected static final String URI_UML_GENMODEL = "org.eclipse.uml2.uml/model/UML.genmodel"; //$NON-NLS-1$
+
+	/** The Constant URI_NOTATION_GENMODEL. */
+	protected static final String URI_NOTATION_GENMODEL = "org.eclipse.gmf.runtime.notation/model/notation.genmodel"; //$NON-NLS-1$
+
+	/** The Constant DEFAULT_NAMED_ELEMENT. */
+	private static final String DEFAULT_NAMED_ELEMENT = "ShapeNamedElement"; //$NON-NLS-1$
+
+	/**
+	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
+	 *
+	 * @param action
+	 */
+	@Override
+	public void run(IAction action) {
+		Iterator<EObject> it = getSelectedEObject().iterator();
+		while (it.hasNext()) {
+			EObject eObject = it.next();
+			if (eObject instanceof GenDiagram) {
+				GenDiagram genDiagram = ((GenDiagram) eObject);
+				createTopNode(genDiagram);
+			}
+		}
+	}
+
+	/**
+	 * Creates the top node.
+	 *
+	 * @param genDiagram
+	 *            the gen diagram
+	 */
+	public void createTopNode(GenDiagram genDiagram) {
+		URI uri_notation = URI.createPlatformPluginURI(URI_NOTATION_GENMODEL, false);
+
+		Resource notation = genDiagram.eResource().getResourceSet().getResource(uri_notation, true);
+
+		GenTopLevelNode topNode = EditpartGenHelper.createTopNode(genDiagram, DEFAULT_NAMED_ELEMENT, findGenClass(notation, GMF_NODE));
+		genDiagram.getTopLevelNodes().add(topNode);
+		EditpartGenHelper.createMetaModelType(topNode, DEFAULT_NAMED_ELEMENT);
+		addBehavior(topNode);
+		addModelFacet(topNode);
+		GenLabel label = EditpartGenHelper.createExternalGenNodeLabel(topNode, DEFAULT_NAMED_ELEMENT_NAME, findGenClass(notation, GMF_NODE));
+		EditpartGenHelper.createLabelViewMap(label, WRAPPING_LABEL);
+		findGenClass(notation, GMF_NODE);
+		EditpartGenHelper.createFigureViewMap(topNode, NODE_NAMED_ELEMENT_FIGURE, 100, 50);
+		URI uri_uml = URI.createPlatformPluginURI(URI_UML_GENMODEL, false);
+		Resource uml = topNode.eResource().getResourceSet().getResource(uri_uml, true);
+		EditpartGenHelper.createLabelModelFacet(label, findGenFeature(uml, NAMED_ELEMENT_NAME, NAME_ATTRIBUTE), EditpartGenHelper.getFirstPredefinedParse(genDiagram.getEditorGen()));
+		MessageDialog.open(MessageDialog.INFORMATION, new Shell(), Messages.generalInformation, MESSAGE_INTRO + MESSAGE_INFO_1 + MESSAGE_INFO_2, MessageDialog.NONE);
+
+	}
+
+	/**
+	 * Adds the behavior.
+	 *
+	 * @param topNode
+	 *            the top node
+	 */
+	public void addBehavior(GenTopLevelNode topNode) {
+		// add behavior
+		EditpartGenHelper.addBehavior(topNode, POPUPBAR_ROLE_KEY, POPUP_BAR_EDIT_POLICY_VALUE);
+		EditpartGenHelper.addBehavior(topNode, STEREOTYPE_LABEL_POLICY_KEY, NODE_LABEL_DISPLAY_EDIT_POLICY_VALUE);
+		EditpartGenHelper.addBehavior(topNode, POLICY_QUALIFIED_NAME_POLICY_KEY, QUALIFIED_NAME_DISPLAY_EDIT_POLICY_VALUE);
+		EditpartGenHelper.addBehavior(topNode, CHANGE_SHAPE_POLICY_KEY, UNKNOW_EDITPOLICY);
+	}
+
+	/**
+	 * Adds the model facet.
+	 *
+	 * @param topNode
+	 *            the top node
+	 */
+	public void addModelFacet(GenTopLevelNode topNode) {
+		URI uri_uml = URI.createPlatformPluginURI(URI_UML_GENMODEL, false);
+		Resource uml = topNode.eResource().getResourceSet().getResource(uri_uml, true);
+		EditpartGenHelper.createModelFacet(topNode, findGenFeature(uml, PACKAGE_NAME, PACKAGED_ELEMENT_ATTRIBUTE), findGenClass(uml, NAMED_ELEMENT_NAME));
+
+	}
+
+}
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/EditpartGenHelper.java b/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/EditpartGenHelper.java
index 69644270aa7..2728dc3f826 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/EditpartGenHelper.java
+++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/EditpartGenHelper.java
@@ -1,259 +1,259 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- *
- * 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:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.papyrusgmfgenextension.popupaction;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
-import org.eclipse.emf.codegen.ecore.genmodel.GenFeature;
-import org.eclipse.gmf.codegen.gmfgen.CustomBehaviour;
-import org.eclipse.gmf.codegen.gmfgen.DefaultSizeAttributes;
-import org.eclipse.gmf.codegen.gmfgen.FeatureLabelModelFacet;
-import org.eclipse.gmf.codegen.gmfgen.FigureViewmap;
-import org.eclipse.gmf.codegen.gmfgen.GMFGenFactory;
-import org.eclipse.gmf.codegen.gmfgen.GenCommonBase;
-import org.eclipse.gmf.codegen.gmfgen.GenDiagram;
-import org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator;
-import org.eclipse.gmf.codegen.gmfgen.GenLabel;
-import org.eclipse.gmf.codegen.gmfgen.GenNode;
-import org.eclipse.gmf.codegen.gmfgen.GenNodeLabel;
-import org.eclipse.gmf.codegen.gmfgen.GenParserImplementation;
-import org.eclipse.gmf.codegen.gmfgen.GenTopLevelNode;
-import org.eclipse.gmf.codegen.gmfgen.MetamodelType;
-import org.eclipse.gmf.codegen.gmfgen.ParentAssignedViewmap;
-import org.eclipse.gmf.codegen.gmfgen.PredefinedParser;
-import org.eclipse.gmf.codegen.gmfgen.StyleAttributes;
-import org.eclipse.gmf.codegen.gmfgen.TypeModelFacet;
-
-
-
-/**
- * The Class EditpartGenHelper tha contains a lot of useful method to create gennodes etc..
- */
-public class EditpartGenHelper {
-
-	/** The Constant EDIT_HELPER. */
-	public static final String EDIT_HELPER = "EditHelper";
-
-	/** The Constant CANONICAL_EDIT_POLICY. */
-	protected static final String CANONICAL_EDIT_POLICY = "CanonicalEditPolicy"; //$NON-NLS-1$
-
-	/** The Constant EDIT_PART. */
-	private static final String EDIT_PART = "EditPart"; //$NON-NLS-1$
-
-	/**
-	 * Adds the behavior.
-	 *
-	 * @param base
-	 *            the base where we want to add a behvior
-	 * @param key
-	 *            the key
-	 * @param value
-	 *            the value
-	 */
-	public static void addBehavior(GenCommonBase base, String key, String value) {
-		CustomBehaviour behaviour = GMFGenFactory.eINSTANCE.createCustomBehaviour();
-		behaviour.setKey(key);
-		behaviour.setEditPolicyQualifiedClassName(value);
-		base.getBehaviour().add(behaviour);
-	}
-
-	/**
-	 * Creates the top node.
-	 *
-	 * @param genDiagram
-	 *            the gen diagram
-	 * @param name
-	 *            the name
-	 * @param visualClass
-	 *            the visual class node etc..
-	 * @return the gen top level node
-	 */
-	public static GenTopLevelNode createTopNode(GenDiagram genDiagram, String name, GenClass visualClass) {
-		GenTopLevelNode topNode = GMFGenFactory.eINSTANCE.createGenTopLevelNode();
-		topNode.setEditPartClassName(name + EDIT_PART);
-		topNode.setCanonicalEditPolicyClassName(name + CANONICAL_EDIT_POLICY);
-		topNode.setCreateCommandClassName(name + "CreateCommand"); //$NON-NLS-1$
-		topNode.setGraphicalNodeEditPolicyClassName(name + "GraphicalNodeEditPolicy"); //$NON-NLS-1$
-		topNode.setItemSemanticEditPolicyClassName(name + "ItemSemanticEditPolicy"); //$NON-NLS-1$
-		topNode.setDiagramRunTimeClass(visualClass);
-		genDiagram.getTopLevelNodes().add(topNode);
-		topNode.setVisualID(SetVisualIDWithUnusedValue.getNewVisualID(topNode.eResource(), topNode.getClass()));
-
-
-		return topNode;
-
-	}
-
-	/**
-	 * Creates the gen node label.
-	 *
-	 * @param genNode
-	 *            the gen node
-	 * @param name
-	 *            the name
-	 * @param visualClass
-	 *            the visual class node etc...
-	 * @return the gen node label
-	 */
-	public static GenNodeLabel createGenNodeLabel(GenNode genNode, String name, GenClass visualClass) {
-		GenNodeLabel nodeLabel = GMFGenFactory.eINSTANCE.createGenNodeLabel();
-		nodeLabel.setEditPartClassName(name + EDIT_PART);
-		nodeLabel.setItemSemanticEditPolicyClassName(name + "ItemSemanticEditPolicy"); //$NON-NLS-1$
-		nodeLabel.setDiagramRunTimeClass(visualClass);
-		genNode.getLabels().add(nodeLabel);
-		nodeLabel.setVisualID(SetVisualIDWithUnusedValue.getNewVisualID(genNode.eResource(), GenCommonBase.class));
-
-		return nodeLabel;
-
-	}
-
-	/**
-	 * Creates the external gen node label.
-	 *
-	 * @param genNode
-	 *            the gen node
-	 * @param name
-	 *            the name
-	 * @param visualClass
-	 *            the visual class node etc ...
-	 * @return the gen node label
-	 */
-	public static GenNodeLabel createExternalGenNodeLabel(GenNode genNode, String name, GenClass visualClass) {
-		GenNodeLabel nodeLabel = GMFGenFactory.eINSTANCE.createGenExternalNodeLabel();
-		nodeLabel.setEditPartClassName(name + EDIT_PART);
-		nodeLabel.setItemSemanticEditPolicyClassName(name + "ItemSemanticEditPolicy"); //$NON-NLS-1$
-		nodeLabel.setDiagramRunTimeClass(visualClass);
-		genNode.getLabels().add(nodeLabel);
-		nodeLabel.setVisualID(SetVisualIDWithUnusedValue.getNewVisualID(genNode.eResource(), GenCommonBase.class));
-
-		return nodeLabel;
-
-	}
-
-	/**
-	 * Creates the meta model type.
-	 *
-	 * @param base
-	 *            the base that will contains the metamodel type
-	 * @param name
-	 *            the name of the edit class helper
-	 */
-	public static void createMetaModelType(GenCommonBase base, String name) {
-		MetamodelType metamodelType = GMFGenFactory.eINSTANCE.createMetamodelType();
-		metamodelType.setDefinedExternally(false);
-		metamodelType.setDisplayName(name);
-		metamodelType.setEditHelperClassName(name + EDIT_HELPER);
-		metamodelType.setDiagramElement(base);
-	}
-
-
-	/**
-	 * Creates the label view map.
-	 *
-	 * @param base
-	 *            the base that will contains the labelview map
-	 * @param qualifiedNameFigure
-	 *            the qualified name figure
-	 */
-	public static void createLabelViewMap(GenCommonBase base, String qualifiedNameFigure) {
-		ParentAssignedViewmap figureViewmap = GMFGenFactory.eINSTANCE.createParentAssignedViewmap();
-		figureViewmap.setFigureQualifiedClassName(qualifiedNameFigure);
-		figureViewmap.setGetterName("getNameLabel");
-		StyleAttributes styleAttributes = GMFGenFactory.eINSTANCE.createStyleAttributes();
-		styleAttributes.setFixedBackground(false);
-		styleAttributes.setFixedFont(true);
-		styleAttributes.setFixedForeground(false);
-
-		figureViewmap.getAttributes().add(styleAttributes);
-		base.setViewmap(figureViewmap);
-	}
-
-	/**
-	 * Creates the figure view map.
-	 *
-	 * @param base
-	 *            the base that will contains the labelview map
-	 * @param qualifiedNameFigure
-	 *            the qualified name figure
-	 * @param width
-	 *            the width of the default figure
-	 * @param height
-	 *            the height of the default figure
-	 */
-	public static void createFigureViewMap(GenCommonBase base, String qualifiedNameFigure, int width, int height) {
-		FigureViewmap figureViewmap = GMFGenFactory.eINSTANCE.createFigureViewmap();
-		figureViewmap.setFigureQualifiedClassName(qualifiedNameFigure);
-		DefaultSizeAttributes defaultSizeAttributes = GMFGenFactory.eINSTANCE.createDefaultSizeAttributes();
-		defaultSizeAttributes.setWidth(width);
-		defaultSizeAttributes.setHeight(height);
-		figureViewmap.getAttributes().add(defaultSizeAttributes);
-		base.setViewmap(figureViewmap);
-	}
-
-	/**
-	 * Creates the model facet.
-	 *
-	 * @param base
-	 *            the base that will contains the model facet
-	 * @param genFeature
-	 *            the gen feature
-	 * @param genclass
-	 *            the genclass
-	 */
-	public static void createModelFacet(GenNode base, GenFeature genFeature, GenClass genclass) {
-		TypeModelFacet facet = GMFGenFactory.eINSTANCE.createTypeModelFacet();
-		facet.setMetaClass(genclass);
-		facet.setContainmentMetaFeature(genFeature);
-		base.setModelFacet(facet);
-
-	}
-
-	/**
-	 * Creates the label model facet.
-	 *
-	 * @param label
-	 *            the label that will contains the label model facet
-	 * @param genFeature
-	 *            the gen feature
-	 * @param value
-	 *            the value
-	 */
-	public static void createLabelModelFacet(GenLabel label, GenFeature genFeature, GenParserImplementation value) {
-		FeatureLabelModelFacet facet = GMFGenFactory.eINSTANCE.createFeatureLabelModelFacet();
-		facet.getMetaFeatures().add(genFeature);
-		facet.setParser(value);
-		label.setModelFacet(facet);
-
-	}
-
-	/**
-	 * Gets the first predefined parse.
-	 *
-	 * @param editorView
-	 *            the editor view
-	 * @return the first predefined parse
-	 */
-	public static PredefinedParser getFirstPredefinedParse(GenEditorGenerator editorView) {
-		Iterator<GenParserImplementation> iter = editorView.getLabelParsers().getImplementations().iterator();
-		while (iter.hasNext()) {
-			GenParserImplementation base = iter.next();
-			if (base instanceof PredefinedParser) {
-				return (PredefinedParser) base;
-			}
-
-		}
-		return null;
-	}
-}
+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * 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:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.papyrusgmfgenextension.popupaction;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
+import org.eclipse.emf.codegen.ecore.genmodel.GenFeature;
+import org.eclipse.gmf.codegen.gmfgen.CustomBehaviour;
+import org.eclipse.gmf.codegen.gmfgen.DefaultSizeAttributes;
+import org.eclipse.gmf.codegen.gmfgen.FeatureLabelModelFacet;
+import org.eclipse.gmf.codegen.gmfgen.FigureViewmap;
+import org.eclipse.gmf.codegen.gmfgen.GMFGenFactory;
+import org.eclipse.gmf.codegen.gmfgen.GenCommonBase;
+import org.eclipse.gmf.codegen.gmfgen.GenDiagram;
+import org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator;
+import org.eclipse.gmf.codegen.gmfgen.GenLabel;
+import org.eclipse.gmf.codegen.gmfgen.GenNode;
+import org.eclipse.gmf.codegen.gmfgen.GenNodeLabel;
+import org.eclipse.gmf.codegen.gmfgen.GenParserImplementation;
+import org.eclipse.gmf.codegen.gmfgen.GenTopLevelNode;
+import org.eclipse.gmf.codegen.gmfgen.MetamodelType;
+import org.eclipse.gmf.codegen.gmfgen.ParentAssignedViewmap;
+import org.eclipse.gmf.codegen.gmfgen.PredefinedParser;
+import org.eclipse.gmf.codegen.gmfgen.StyleAttributes;
+import org.eclipse.gmf.codegen.gmfgen.TypeModelFacet;
+
+
+
+/**
+ * The Class EditpartGenHelper tha contains a lot of useful method to create gennodes etc..
+ */
+public class EditpartGenHelper {
+
+	/** The Constant EDIT_HELPER. */
+	public static final String EDIT_HELPER = "EditHelper";
+
+	/** The Constant CANONICAL_EDIT_POLICY. */
+	protected static final String CANONICAL_EDIT_POLICY = "CanonicalEditPolicy"; //$NON-NLS-1$
+
+	/** The Constant EDIT_PART. */
+	private static final String EDIT_PART = "EditPart"; //$NON-NLS-1$
+
+	/**
+	 * Adds the behavior.
+	 *
+	 * @param base
+	 *            the base where we want to add a behvior
+	 * @param key
+	 *            the key
+	 * @param value
+	 *            the value
+	 */
+	public static void addBehavior(GenCommonBase base, String key, String value) {
+		CustomBehaviour behaviour = GMFGenFactory.eINSTANCE.createCustomBehaviour();
+		behaviour.setKey(key);
+		behaviour.setEditPolicyQualifiedClassName(value);
+		base.getBehaviour().add(behaviour);
+	}
+
+	/**
+	 * Creates the top node.
+	 *
+	 * @param genDiagram
+	 *            the gen diagram
+	 * @param name
+	 *            the name
+	 * @param visualClass
+	 *            the visual class node etc..
+	 * @return the gen top level node
+	 */
+	public static GenTopLevelNode createTopNode(GenDiagram genDiagram, String name, GenClass visualClass) {
+		GenTopLevelNode topNode = GMFGenFactory.eINSTANCE.createGenTopLevelNode();
+		topNode.setEditPartClassName(name + EDIT_PART);
+		topNode.setCanonicalEditPolicyClassName(name + CANONICAL_EDIT_POLICY);
+		topNode.setCreateCommandClassName(name + "CreateCommand"); //$NON-NLS-1$
+		topNode.setGraphicalNodeEditPolicyClassName(name + "GraphicalNodeEditPolicy"); //$NON-NLS-1$
+		topNode.setItemSemanticEditPolicyClassName(name + "ItemSemanticEditPolicy"); //$NON-NLS-1$
+		topNode.setDiagramRunTimeClass(visualClass);
+		genDiagram.getTopLevelNodes().add(topNode);
+		topNode.setVisualID(SetVisualIDWithUnusedValue.getNewVisualID(topNode.eResource(), topNode.getClass()));
+
+
+		return topNode;
+
+	}
+
+	/**
+	 * Creates the gen node label.
+	 *
+	 * @param genNode
+	 *            the gen node
+	 * @param name
+	 *            the name
+	 * @param visualClass
+	 *            the visual class node etc...
+	 * @return the gen node label
+	 */
+	public static GenNodeLabel createGenNodeLabel(GenNode genNode, String name, GenClass visualClass) {
+		GenNodeLabel nodeLabel = GMFGenFactory.eINSTANCE.createGenNodeLabel();
+		nodeLabel.setEditPartClassName(name + EDIT_PART);
+		nodeLabel.setItemSemanticEditPolicyClassName(name + "ItemSemanticEditPolicy"); //$NON-NLS-1$
+		nodeLabel.setDiagramRunTimeClass(visualClass);
+		genNode.getLabels().add(nodeLabel);
+		nodeLabel.setVisualID(SetVisualIDWithUnusedValue.getNewVisualID(genNode.eResource(), GenCommonBase.class));
+
+		return nodeLabel;
+
+	}
+
+	/**
+	 * Creates the external gen node label.
+	 *
+	 * @param genNode
+	 *            the gen node
+	 * @param name
+	 *            the name
+	 * @param visualClass
+	 *            the visual class node etc ...
+	 * @return the gen node label
+	 */
+	public static GenNodeLabel createExternalGenNodeLabel(GenNode genNode, String name, GenClass visualClass) {
+		GenNodeLabel nodeLabel = GMFGenFactory.eINSTANCE.createGenExternalNodeLabel();
+		nodeLabel.setEditPartClassName(name + EDIT_PART);
+		nodeLabel.setItemSemanticEditPolicyClassName(name + "ItemSemanticEditPolicy"); //$NON-NLS-1$
+		nodeLabel.setDiagramRunTimeClass(visualClass);
+		genNode.getLabels().add(nodeLabel);
+		nodeLabel.setVisualID(SetVisualIDWithUnusedValue.getNewVisualID(genNode.eResource(), GenCommonBase.class));
+
+		return nodeLabel;
+
+	}
+
+	/**
+	 * Creates the meta model type.
+	 *
+	 * @param base
+	 *            the base that will contains the metamodel type
+	 * @param name
+	 *            the name of the edit class helper
+	 */
+	public static void createMetaModelType(GenCommonBase base, String name) {
+		MetamodelType metamodelType = GMFGenFactory.eINSTANCE.createMetamodelType();
+		metamodelType.setDefinedExternally(false);
+		metamodelType.setDisplayName(name);
+		metamodelType.setEditHelperClassName(name + EDIT_HELPER);
+		metamodelType.setDiagramElement(base);
+	}
+
+
+	/**
+	 * Creates the label view map.
+	 *
+	 * @param base
+	 *            the base that will contains the labelview map
+	 * @param qualifiedNameFigure
+	 *            the qualified name figure
+	 */
+	public static void createLabelViewMap(GenCommonBase base, String qualifiedNameFigure) {
+		ParentAssignedViewmap figureViewmap = GMFGenFactory.eINSTANCE.createParentAssignedViewmap();
+		figureViewmap.setFigureQualifiedClassName(qualifiedNameFigure);
+		figureViewmap.setGetterName("getNameLabel");
+		StyleAttributes styleAttributes = GMFGenFactory.eINSTANCE.createStyleAttributes();
+		styleAttributes.setFixedBackground(false);
+		styleAttributes.setFixedFont(true);
+		styleAttributes.setFixedForeground(false);
+
+		figureViewmap.getAttributes().add(styleAttributes);
+		base.setViewmap(figureViewmap);
+	}
+
+	/**
+	 * Creates the figure view map.
+	 *
+	 * @param base
+	 *            the base that will contains the labelview map
+	 * @param qualifiedNameFigure
+	 *            the qualified name figure
+	 * @param width
+	 *            the width of the default figure
+	 * @param height
+	 *            the height of the default figure
+	 */
+	public static void createFigureViewMap(GenCommonBase base, String qualifiedNameFigure, int width, int height) {
+		FigureViewmap figureViewmap = GMFGenFactory.eINSTANCE.createFigureViewmap();
+		figureViewmap.setFigureQualifiedClassName(qualifiedNameFigure);
+		DefaultSizeAttributes defaultSizeAttributes = GMFGenFactory.eINSTANCE.createDefaultSizeAttributes();
+		defaultSizeAttributes.setWidth(width);
+		defaultSizeAttributes.setHeight(height);
+		figureViewmap.getAttributes().add(defaultSizeAttributes);
+		base.setViewmap(figureViewmap);
+	}
+
+	/**
+	 * Creates the model facet.
+	 *
+	 * @param base
+	 *            the base that will contains the model facet
+	 * @param genFeature
+	 *            the gen feature
+	 * @param genclass
+	 *            the genclass
+	 */
+	public static void createModelFacet(GenNode base, GenFeature genFeature, GenClass genclass) {
+		TypeModelFacet facet = GMFGenFactory.eINSTANCE.createTypeModelFacet();
+		facet.setMetaClass(genclass);
+		facet.setContainmentMetaFeature(genFeature);
+		base.setModelFacet(facet);
+
+	}
+
+	/**
+	 * Creates the label model facet.
+	 *
+	 * @param label
+	 *            the label that will contains the label model facet
+	 * @param genFeature
+	 *            the gen feature
+	 * @param value
+	 *            the value
+	 */
+	public static void createLabelModelFacet(GenLabel label, GenFeature genFeature, GenParserImplementation value) {
+		FeatureLabelModelFacet facet = GMFGenFactory.eINSTANCE.createFeatureLabelModelFacet();
+		facet.getMetaFeatures().add(genFeature);
+		facet.setParser(value);
+		label.setModelFacet(facet);
+
+	}
+
+	/**
+	 * Gets the first predefined parse.
+	 *
+	 * @param editorView
+	 *            the editor view
+	 * @return the first predefined parse
+	 */
+	public static PredefinedParser getFirstPredefinedParse(GenEditorGenerator editorView) {
+		Iterator<GenParserImplementation> iter = editorView.getLabelParsers().getImplementations().iterator();
+		while (iter.hasNext()) {
+			GenParserImplementation base = iter.next();
+			if (base instanceof PredefinedParser) {
+				return (PredefinedParser) base;
+			}
+
+		}
+		return null;
+	}
+}
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/Messages.java b/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/Messages.java
index bb014d8a1ac..38ac7b07234 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/Messages.java
+++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/Messages.java
@@ -1,51 +1,51 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- *
- * 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:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.papyrusgmfgenextension.popupaction;
-
-import org.eclipse.osgi.util.NLS;
-
-
-/**
- * The Class Messages.
- */
-public class Messages extends NLS {
-
-	/** The Constant BUNDLE_NAME. */
-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.papyrusgmfgenextension.popupaction.messages"; //$NON-NLS-1$
-
-	/** The rules about named element. */
-	public static String rulesAboutNamedElement;
-
-	/** The message_ intro. */
-	public static String message_Intro;
-
-	/** The rules about shape edit part. */
-	public static String rulesAboutShapeEditPart;
-
-	/** The rule about change edit policy. */
-	public static String ruleAboutChangeEditPolicy;
-
-	/** The general information. */
-	public static String generalInformation;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	/**
-	 * Instantiates a new messages.
-	 */
-	private Messages() {
-	}
-}
+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *
+ * 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:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.papyrusgmfgenextension.popupaction;
+
+import org.eclipse.osgi.util.NLS;
+
+
+/**
+ * The Class Messages.
+ */
+public class Messages extends NLS {
+
+	/** The Constant BUNDLE_NAME. */
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.papyrusgmfgenextension.popupaction.messages"; //$NON-NLS-1$
+
+	/** The rules about named element. */
+	public static String rulesAboutNamedElement;
+
+	/** The message_ intro. */
+	public static String message_Intro;
+
+	/** The rules about shape edit part. */
+	public static String rulesAboutShapeEditPart;
+
+	/** The rule about change edit policy. */
+	public static String ruleAboutChangeEditPolicy;
+
+	/** The general information. */
+	public static String generalInformation;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	/**
+	 * Instantiates a new messages.
+	 */
+	private Messages() {
+	}
+}
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/SetCompartmentNeedsTitleToTrueAction.java b/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/SetCompartmentNeedsTitleToTrueAction.java
index b8c6ddc2631..7f23d4804d9 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/SetCompartmentNeedsTitleToTrueAction.java
+++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/SetCompartmentNeedsTitleToTrueAction.java
@@ -1,66 +1,66 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- *
- * 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:
- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *****************************************************************************/
-
-
-package org.eclipse.papyrus.papyrusgmfgenextension.popupaction;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.gmf.codegen.gmfgen.GMFGenPackage;
-import org.eclipse.gmf.codegen.gmfgen.GenCompartment;
-import org.eclipse.jface.action.IAction;
-
-/**
- * This action allows to set the field Needs Title in the Selected Compartments to true
- *
- * This action was created for the bug 343092.
- *
- */
-public class SetCompartmentNeedsTitleToTrueAction extends Action {
-
-
-	@Override
-	public void run(IAction action) {
-
-		CompoundCommand command = new CompoundCommand();
-		List<EObject> selection = getSelectedEObject();
-		if (!selection.isEmpty()) {
-			EditingDomain domain = AdapterFactoryEditingDomain.getEditingDomainFor(selection.get(0));
-			Assert.isNotNull(domain);
-			Iterator<EObject> iter = selection.iterator();
-			while (iter.hasNext()) {
-				Object current = iter.next();
-				if (current instanceof GenCompartment) {
-					GenCompartment compartment = (GenCompartment) current;
-					// we set that the compartment needs to have a Title
-					Command cmd = SetCommand.create(domain, compartment, GMFGenPackage.eINSTANCE.getGenCompartment_NeedsTitle(), true);
-					if (cmd.canExecute()) {
-						command.append(cmd);
-					}
-				}
-			}
-
-			if (command.canExecute()) {
-				domain.getCommandStack().execute(command);
-			}
-		}
-	}
-}
+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ *
+ * 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:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *****************************************************************************/
+
+
+package org.eclipse.papyrus.papyrusgmfgenextension.popupaction;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.gmf.codegen.gmfgen.GMFGenPackage;
+import org.eclipse.gmf.codegen.gmfgen.GenCompartment;
+import org.eclipse.jface.action.IAction;
+
+/**
+ * This action allows to set the field Needs Title in the Selected Compartments to true
+ *
+ * This action was created for the bug 343092.
+ *
+ */
+public class SetCompartmentNeedsTitleToTrueAction extends Action {
+
+
+	@Override
+	public void run(IAction action) {
+
+		CompoundCommand command = new CompoundCommand();
+		List<EObject> selection = getSelectedEObject();
+		if (!selection.isEmpty()) {
+			EditingDomain domain = AdapterFactoryEditingDomain.getEditingDomainFor(selection.get(0));
+			Assert.isNotNull(domain);
+			Iterator<EObject> iter = selection.iterator();
+			while (iter.hasNext()) {
+				Object current = iter.next();
+				if (current instanceof GenCompartment) {
+					GenCompartment compartment = (GenCompartment) current;
+					// we set that the compartment needs to have a Title
+					Command cmd = SetCommand.create(domain, compartment, GMFGenPackage.eINSTANCE.getGenCompartment_NeedsTitle(), true);
+					if (cmd.canExecute()) {
+						command.append(cmd);
+					}
+				}
+			}
+
+			if (command.canExecute()) {
+				domain.getCommandStack().execute(command);
+			}
+		}
+	}
+}
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/messages.properties b/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/messages.properties
index ed1008e119c..500f4e5ba6e 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/messages.properties
+++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/src/org/eclipse/papyrus/papyrusgmfgenextension/popupaction/messages.properties
@@ -1,5 +1,5 @@
-rulesAboutNamedElement=set in the gmf extension that this edit part must inherits from org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart
-message_Intro=Do not forget :\n
-rulesAboutShapeEditPart=- set the abstract editpart in the gmf extension: org.eclipse.papyrus.diagram.common.editparts.AbstractShapeEditPart\n
-ruleAboutChangeEditPolicy=- Fill the editpolicy CHANGE_SHAPE_POLICY  that have to inherit from org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy
-generalInformation=Generation Information
+rulesAboutNamedElement=set in the gmf extension that this edit part must inherits from org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart
+message_Intro=Do not forget :\n
+rulesAboutShapeEditPart=- set the abstract editpart in the gmf extension: org.eclipse.papyrus.diagram.common.editparts.AbstractShapeEditPart\n
+ruleAboutChangeEditPolicy=- Fill the editpolicy CHANGE_SHAPE_POLICY  that have to inherit from org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy
+generalInformation=Generation Information
author	Quentin Le Menez	2018-01-09 10:09:46 +0000
committer	Quentin Le Menez	2018-01-09 13:18:15 +0000
commit	d98116b5b376f18b6cf626ba4158a35fe9a4a64e (patch)
tree	4458c9c5ada0a216b385813a56ea9a9b8c7b6509 /plugins/developer/org.eclipse.papyrus.gmfgenextension
parent	453e99bc2dcbd5fabad100f9d0d5f682013c3b19 (diff)
download	org.eclipse.papyrus-d98116b5b376f18b6cf626ba4158a35fe9a4a64e.tar.gz org.eclipse.papyrus-d98116b5b376f18b6cf626ba4158a35fe9a4a64e.tar.xz org.eclipse.papyrus-d98116b5b376f18b6cf626ba4158a35fe9a4a64e.zip